diff --git a/odoo_sh/getting_started/branches.rst b/odoo_sh/getting_started/branches.rst index 43978ba0c..40195f030 100644 --- a/odoo_sh/getting_started/branches.rst +++ b/odoo_sh/getting_started/branches.rst @@ -284,11 +284,11 @@ The production branch has no settings. It can't be muted, will always update the run on the project's version of Odoo. If you want to upgrade your production to a newer version please refer to the :ref:`Upgrade section `. -Git commands -============ -In the top right-hand corner of the view, different Git commands are available. +Shell commands +============== +In the top right-hand corner of the view, different shell commands are available. -.. image:: ./media/interface-branches-gitcommands.png +.. image:: ./media/interface-branches-shellcommands.png :align: center Each command can be copied in the clipboard to be used in a terminal, @@ -343,6 +343,24 @@ Merges the branch *staging-1* in the current branch. Uploads the changes you just added in the *master* branch on your remote repository. +SSH +--- +Connect to your builds using ssh. + +.. code-block:: bash + + $ ssh @ + +You can configure your ssh keys in your profile settings in the top-right menu when clicking on your username. + +Provided you have the :ref:`correct access rights ` on the project, +you'll be granted ssh access to the build. + +.. Note:: + Long running ssh connections are not guaranteed. Idle connections will be + disconnected in order to free up resources. + + Submodule --------- diff --git a/odoo_sh/getting_started/media/interface-branches-gitcommands.png b/odoo_sh/getting_started/media/interface-branches-gitcommands.png deleted file mode 100644 index cd3a041d3..000000000 Binary files a/odoo_sh/getting_started/media/interface-branches-gitcommands.png and /dev/null differ diff --git a/odoo_sh/getting_started/media/interface-branches-shellcommands.png b/odoo_sh/getting_started/media/interface-branches-shellcommands.png new file mode 100644 index 000000000..5cfb89d12 Binary files /dev/null and b/odoo_sh/getting_started/media/interface-branches-shellcommands.png differ diff --git a/odoo_sh/getting_started/settings.rst b/odoo_sh/getting_started/settings.rst index 48c733b77..12f17c24f 100644 --- a/odoo_sh/getting_started/settings.rst +++ b/odoo_sh/getting_started/settings.rst @@ -25,6 +25,8 @@ This defines the address that will be used to access your production database. Addresses of your staging and development builds are derived from this name and assigned automatically. However, when you change your project name, only future builds will use the new name. +.. _odoosh-gettingstarted-settings-collaborators: + Collaborators =============