diff options
| -rw-r--r-- | app/views/projects/deployments/_actions.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/environments/_form.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/60224-btn-env.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/60261-save-btn-env.yml | 5 | ||||
| -rw-r--r-- | doc/administration/high_availability/nfs.md | 11 | ||||
| -rw-r--r-- | qa/Dockerfile | 2 |
6 files changed, 15 insertions, 12 deletions
diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml index e45c5be76de..c84c376d57b 100644 --- a/app/views/projects/deployments/_actions.haml +++ b/app/views/projects/deployments/_actions.haml @@ -10,5 +10,5 @@ - actions.each do |action| - next unless can?(current_user, :update_build, action) %li - = link_to [:play, @project.namespace.becomes(Namespace), @project, action], method: :post, rel: 'nofollow', class: 'btn' do + = link_to [:play, @project.namespace.becomes(Namespace), @project, action], method: :post, rel: 'nofollow' do %span= action.name diff --git a/app/views/projects/environments/_form.html.haml b/app/views/projects/environments/_form.html.haml index cbd5c54cecc..1fbe34cfff3 100644 --- a/app/views/projects/environments/_form.html.haml +++ b/app/views/projects/environments/_form.html.haml @@ -17,5 +17,5 @@ = f.url_field :external_url, class: 'form-control' .form-actions - = f.submit _('Save'), class: 'btn btn-save' + = f.submit _('Save'), class: 'btn btn-success' = link_to _('Cancel'), project_environments_path(@project), class: 'btn btn-cancel' diff --git a/changelogs/unreleased/60224-btn-env.yml b/changelogs/unreleased/60224-btn-env.yml new file mode 100644 index 00000000000..5053ddb31fa --- /dev/null +++ b/changelogs/unreleased/60224-btn-env.yml @@ -0,0 +1,5 @@ +--- +title: Fixes actions dropdowns in environments page +merge_request: 27160 +author: +type: fixed diff --git a/changelogs/unreleased/60261-save-btn-env.yml b/changelogs/unreleased/60261-save-btn-env.yml new file mode 100644 index 00000000000..b0936198d2e --- /dev/null +++ b/changelogs/unreleased/60261-save-btn-env.yml @@ -0,0 +1,5 @@ +--- +title: Fixes create button background for Environments form +merge_request: 27161 +author: +type: fixed diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md index f406163aea0..72341a5c777 100644 --- a/doc/administration/high_availability/nfs.md +++ b/doc/administration/high_availability/nfs.md @@ -145,7 +145,6 @@ mountpoint └── gitlab-data ├── builds ├── git-data - ├── home-git ├── shared └── uploads ``` @@ -158,16 +157,11 @@ configuration to move each data location to a subdirectory: ```ruby git_data_dirs({"default" => { "path" => "/gitlab-nfs/gitlab-data/git-data"} }) -user['home'] = '/gitlab-nfs/gitlab-data/home' gitlab_rails['uploads_directory'] = '/gitlab-nfs/gitlab-data/uploads' gitlab_rails['shared_path'] = '/gitlab-nfs/gitlab-data/shared' gitlab_ci['builds_directory'] = '/gitlab-nfs/gitlab-data/builds' ``` -To move the `git` home directory, all GitLab services must be stopped. Run -`gitlab-ctl stop && initctl stop gitlab-runsvdir`. Then continue with the -reconfigure. - Run `sudo gitlab-ctl reconfigure` to start using the central location. Please be aware that if you had existing data you will need to manually copy/rsync it to these new locations and then restart GitLab. @@ -197,14 +191,13 @@ are empty before attempting a restore. Read more about the ## Multiple NFS mounts -When using default Omnibus configuration you will need to share 5 data locations +When using default Omnibus configuration you will need to share 4 data locations between all GitLab cluster nodes. No other locations should be shared. The -following are the 5 locations need to be shared: +following are the 4 locations need to be shared: | Location | Description | Default configuration | | -------- | ----------- | --------------------- | | `/var/opt/gitlab/git-data` | Git repository data. This will account for a large portion of your data | `git_data_dirs({"default" => { "path" => "/var/opt/gitlab/git-data"} })` -| `/var/opt/gitlab/.ssh` | SSH `authorized_keys` file and keys used to import repositories from some other Git services | `user['home'] = '/var/opt/gitlab/'` | `/var/opt/gitlab/gitlab-rails/uploads` | User uploaded attachments | `gitlab_rails['uploads_directory'] = '/var/opt/gitlab/gitlab-rails/uploads'` | `/var/opt/gitlab/gitlab-rails/shared` | Build artifacts, GitLab Pages, LFS objects, temp files, etc. If you're using LFS this may also account for a large portion of your data | `gitlab_rails['shared_path'] = '/var/opt/gitlab/gitlab-rails/shared'` | `/var/opt/gitlab/gitlab-ci/builds` | GitLab CI build traces | `gitlab_ci['builds_directory'] = '/var/opt/gitlab/gitlab-ci/builds'` diff --git a/qa/Dockerfile b/qa/Dockerfile index ca7f9accb70..ae3ec2acfdf 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -30,7 +30,7 @@ RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-17.09. # RUN curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add - RUN echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list -RUN apt-get update -q && apt-get install -y google-chrome-stable && apt-get clean +RUN apt-get update -q && apt-get install -y --allow-unauthenticated google-chrome-stable && apt-get clean ## # Install chromedriver to make it work with Selenium |