From a1d0a16bfbef8654684bca828505632bcfaaaeba Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Thu, 14 Jun 2018 21:31:54 -0500
Subject: Fix flakey time-senstive group filter specs

This passed previously because the filtered group search is debounced by 0.5s. The test cleared the input, entered `group1`, cleared the input, entered nothing, and the all of groups are still listed because of the 0.5s debounce hasn't triggered and the test passes before anything is actually filtered.

Even if we assert that the list is filtered before clearing the input, the test still fails because the nature of the `fill_in 'filter', with: ""` method is that ["if you're setting the value to "", no keys are ever actually sent, hence no [`input`] event"](https://github.com/teamcapybara/capybara/issues/203#issuecomment-557281) and we never filter back to everything in the list.

So the solution is two-fold, add in the assertions that the list is actually filtered after each step. Then use a method that fills the input with proper events fired.
---
 spec/features/dashboard/groups_list_spec.rb | 4 ++++
 spec/features/explore/groups_list_spec.rb   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb
index ed47f7ed390..29280bd6e06 100644
--- a/spec/features/dashboard/groups_list_spec.rb
+++ b/spec/features/dashboard/groups_list_spec.rb
@@ -65,7 +65,11 @@ feature 'Dashboard Groups page', :js do
       fill_in 'filter', with: group.name
       wait_for_requests
 
+      expect(page).to have_content(group.name)
+      expect(page).not_to have_content(nested_group.parent.name)
+
       fill_in 'filter', with: ''
+      page.find('[name="filter"]').send_keys(:enter)
       wait_for_requests
 
       expect(page).to have_content(group.name)
diff --git a/spec/features/explore/groups_list_spec.rb b/spec/features/explore/groups_list_spec.rb
index 801a33979ff..ad02b454aee 100644
--- a/spec/features/explore/groups_list_spec.rb
+++ b/spec/features/explore/groups_list_spec.rb
@@ -35,7 +35,11 @@ describe 'Explore Groups page', :js do
     fill_in 'filter', with: group.name
     wait_for_requests
 
+    expect(page).to have_content(group.full_name)
+    expect(page).not_to have_content(public_group.full_name)
+
     fill_in 'filter', with: ""
+    page.find('[name="filter"]').send_keys(:enter)
     wait_for_requests
 
     expect(page).to have_content(group.full_name)
-- 
cgit v1.2.1


From 69de7b42cf7d3f0c99d63f1778f7f0b9d15ddfd8 Mon Sep 17 00:00:00 2001
From: Ahmad Hassan <ahmad.hassan612@gmail.com>
Date: Wed, 13 Jun 2018 11:19:17 +0200
Subject: Migrate repo backup to gitaly

---
 GITALY_SERVER_VERSION                              |   2 +-
 Gemfile                                            |   2 +-
 Gemfile.lock                                       |   4 +-
 Gemfile.rails5.lock                                |   4 +-
 .../unreleased/use-backup-custom-hooks-gitaly.yml  |   5 +
 lib/backup/repository.rb                           | 123 ++++++++++++++-------
 lib/gitlab/gitaly_client/repository_service.rb     |  42 +++++--
 7 files changed, 122 insertions(+), 60 deletions(-)
 create mode 100644 changelogs/unreleased/use-backup-custom-hooks-gitaly.yml

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index c64d9d48a48..a9a7f3fec01 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-0.105.1
+0.107.0
diff --git a/Gemfile b/Gemfile
index 98622cdde84..4bdb255c498 100644
--- a/Gemfile
+++ b/Gemfile
@@ -419,7 +419,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.102.0', require: 'gitaly'
 gem 'grpc', '~> 1.11.0'
 
 # Locked until https://github.com/google/protobuf/issues/4210 is closed
diff --git a/Gemfile.lock b/Gemfile.lock
index 883e580b86b..8d508cc0f39 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -283,7 +283,7 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (0.101.0)
+    gitaly-proto (0.102.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
     github-linguist (5.3.3)
@@ -1039,7 +1039,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.101.0)
+  gitaly-proto (~> 0.102.0)
   github-linguist (~> 5.3.3)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 952e27df29d..bff1d0cba70 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -286,7 +286,7 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (0.101.0)
+    gitaly-proto (0.102.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
     github-linguist (5.3.3)
@@ -1049,7 +1049,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.101.0)
+  gitaly-proto (~> 0.102.0)
   github-linguist (~> 5.3.3)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
diff --git a/changelogs/unreleased/use-backup-custom-hooks-gitaly.yml b/changelogs/unreleased/use-backup-custom-hooks-gitaly.yml
new file mode 100644
index 00000000000..4b9766332c3
--- /dev/null
+++ b/changelogs/unreleased/use-backup-custom-hooks-gitaly.yml
@@ -0,0 +1,5 @@
+---
+title: migrate backup rake task to gitaly
+merge_request:
+author:
+type: added
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 0119c5d6851..127c2477810 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -16,64 +16,33 @@ module Backup
       prepare
 
       Project.find_each(batch_size: 1000) do |project|
+        # Create namespace dir or hashed path if missing
         progress.print " * #{display_repo_path(project)} ... "
 
-        path_to_project_repo = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-          path_to_repo(project)
-        end
-        path_to_project_bundle = path_to_bundle(project)
-
-        # Create namespace dir or hashed path if missing
         if project.hashed_storage?(:repository)
           FileUtils.mkdir_p(File.dirname(File.join(backup_repos_path, project.disk_path)))
         else
           FileUtils.mkdir_p(File.join(backup_repos_path, project.namespace.full_path)) if project.namespace
         end
 
-        if empty_repo?(project)
-          progress.puts "[SKIPPED]".color(:cyan)
+        if !empty_repo?(project)
+          backup_project(project)
         else
-          in_path(path_to_project_repo) do |dir|
-            FileUtils.mkdir_p(path_to_tars(project))
-            cmd = %W(tar -cf #{path_to_tars(project, dir)} -C #{path_to_project_repo} #{dir})
-            output, status = Gitlab::Popen.popen(cmd)
-
-            unless status.zero?
-              progress_warn(project, cmd.join(' '), output)
-            end
-          end
-
-          cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{path_to_project_repo} bundle create #{path_to_project_bundle} --all)
-          output, status = Gitlab::Popen.popen(cmd)
-
-          if status.zero?
-            progress.puts "[DONE]".color(:green)
-          else
-            progress_warn(project, cmd.join(' '), output)
-          end
+          progress.puts "[SKIPPED]".color(:cyan)
         end
 
         wiki = ProjectWiki.new(project)
         path_to_wiki_repo = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
           path_to_repo(wiki)
         end
-        path_to_wiki_bundle = path_to_bundle(wiki)
 
-        if File.exist?(path_to_wiki_repo)
-          progress.print " * #{display_repo_path(wiki)} ... "
-
-          if empty_repo?(wiki)
-            progress.puts " [SKIPPED]".color(:cyan)
-          else
-            cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{path_to_wiki_repo} bundle create #{path_to_wiki_bundle} --all)
-            output, status = Gitlab::Popen.popen(cmd)
-            if status.zero?
-              progress.puts " [DONE]".color(:green)
-            else
-              progress_warn(wiki, cmd.join(' '), output)
-            end
-          end
+        if File.exist?(path_to_wiki_repo) && !empty_repo?(wiki)
+          backup_project(wiki)
+        else
+          progress.puts "[SKIPPED] Wiki".color(:cyan)
         end
+
+        progress.puts "[DONE]".color(:green)
       end
     end
 
@@ -83,6 +52,40 @@ module Backup
       end
     end
 
+    def backup_project(project)
+      gitaly_migrate(:repository_backup) do |is_enabled|
+        if is_enabled
+          backup_project_gitaly(project)
+        else
+          backup_project_local(project)
+        end
+      end
+    rescue => e
+      progress_warn(project, e, 'Failed to backup repo')
+    end
+
+    def backup_project_gitaly(project)
+      path_to_project_bundle = path_to_bundle(project)
+      Gitlab::GitalyClient::RepositoryService.new(project.repository)
+        .create_bundle(path_to_project_bundle)
+
+      backup_custom_hooks(project)
+    end
+
+    def backup_project_local(project)
+      path_to_project_repo = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
+        path_to_repo(project)
+      end
+
+      path_to_project_bundle = path_to_bundle(project)
+
+      backup_custom_hooks(project)
+
+      cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{path_to_project_repo} bundle create #{path_to_project_bundle} --all)
+      output, status = Gitlab::Popen.popen(cmd)
+      progress_warn(project, cmd.join(' '), output) unless status.zero?
+    end
+
     def delete_all_repositories(name, repository_storage)
       gitaly_migrate(:delete_all_repositories) do |is_enabled|
         if is_enabled
@@ -129,13 +132,47 @@ module Backup
         .restore_custom_hooks(custom_hooks_path)
     end
 
+    def local_backup_custom_hooks(project)
+      in_path(path_to_tars(project)) do |dir|
+        path_to_project_repo = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
+          path_to_repo(project)
+        end
+        break unless File.exist?(File.join(path_to_project_repo, dir))
+
+        FileUtils.mkdir_p(path_to_tars(project))
+        cmd = %W(tar -cf #{path_to_tars(project, dir)} -c #{path_to_project_repo} #{dir})
+        output, status = Gitlab::Popen.popen(cmd)
+
+        unless status.zero?
+          progress_warn(project, cmd.join(' '), output)
+        end
+      end
+    end
+
+    def gitaly_backup_custom_hooks(project)
+      FileUtils.mkdir_p(path_to_tars(project))
+      custom_hooks_path = path_to_tars(project, 'custom_hooks')
+      Gitlab::GitalyClient::RepositoryService.new(project.repository)
+        .backup_custom_hooks(custom_hooks_path)
+    end
+
+    def backup_custom_hooks(project)
+      gitaly_migrate(:backup_custom_hooks) do |is_enabled|
+        if is_enabled
+          gitaly_backup_custom_hooks(project)
+        else
+          local_backup_custom_hooks(project)
+        end
+      end
+    end
+
     def restore_custom_hooks(project)
       in_path(path_to_tars(project)) do |dir|
         gitaly_migrate(:restore_custom_hooks) do |is_enabled|
           if is_enabled
-            local_restore_custom_hooks(project, dir)
-          else
             gitaly_restore_custom_hooks(project, dir)
+          else
+            local_restore_custom_hooks(project, dir)
           end
         end
       end
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index 4340f779e53..ca986434221 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -196,20 +196,21 @@ module Gitlab
       end
 
       def create_bundle(save_path)
-        request = Gitaly::CreateBundleRequest.new(repository: @gitaly_repo)
-        response = GitalyClient.call(
-          @storage,
-          :repository_service,
+        gitaly_fetch_stream_to_file(
+          save_path,
           :create_bundle,
-          request,
-          timeout: GitalyClient.default_timeout
+          Gitaly::CreateBundleRequest,
+          GitalyClient.default_timeout
         )
+      end
 
-        File.open(save_path, 'wb') do |f|
-          response.each do |message|
-            f.write(message.data)
-          end
-        end
+      def backup_custom_hooks(save_path)
+        gitaly_fetch_stream_to_file(
+          save_path,
+          :backup_custom_hooks,
+          Gitaly::BackupCustomHooksRequest,
+          GitalyClient.default_timeout
+        )
       end
 
       def create_from_bundle(bundle_path)
@@ -309,6 +310,25 @@ module Gitlab
 
       private
 
+      def gitaly_fetch_stream_to_file(save_path, rpc_name, request_class, timeout)
+        request = request_class.new(repository: @gitaly_repo)
+        response = GitalyClient.call(
+          @storage,
+          :repository_service,
+          rpc_name,
+          request,
+          timeout: timeout
+        )
+
+        File.open(save_path, 'wb') do |f|
+          response.each do |message|
+            f.write(message.data)
+          end
+        end
+        # If the file is empty means that we recieved an empty stream, we delete the file
+        FileUtils.rm(save_path) if File.zero?(save_path)
+      end
+
       def gitaly_repo_stream_request(file_path, rpc_name, request_class, timeout)
         request = request_class.new(repository: @gitaly_repo)
         enum = Enumerator.new do |y|
-- 
cgit v1.2.1


From 37bd3d44c6c985fc6e2a61488aadd31b01f36eb0 Mon Sep 17 00:00:00 2001
From: Jose <jvargas@gitlab.com>
Date: Thu, 14 Jun 2018 15:30:40 -0500
Subject: Fix missing underline on focus states for anchor tags

---
 app/assets/stylesheets/bootstrap_migration.scss          | 5 +++++
 app/assets/stylesheets/framework/contextual_sidebar.scss | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 5da0e672288..cf952f026f5 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -89,6 +89,11 @@ a {
   color: $gl-link-color;
 }
 
+a:not(.btn):focus,
+a:not(.btn):active {
+  text-decoration: underline;
+}
+
 hr {
   overflow: hidden;
 }
diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss
index 9cbaaa5dc8d..cccd1a6d942 100644
--- a/app/assets/stylesheets/framework/contextual_sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual_sidebar.scss
@@ -193,6 +193,7 @@
       &:focus {
         background: $link-active-background;
         color: $gl-text-color;
+        text-decoration: none;
       }
     }
 
-- 
cgit v1.2.1


From a6312081d811d87ea2c3778c52acaa8476361eff Mon Sep 17 00:00:00 2001
From: Lukas Eipert <leipert@gitlab.com>
Date: Sat, 16 Jun 2018 13:59:26 +0200
Subject: use eslint config parameter instead of sed

eslint has the possibility to ignore inline config `no-inline-config`, so we should use that
---
 .gitlab-ci.yml | 2 --
 package.json   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7304b9c057..30c21b452e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -815,8 +815,6 @@ lint:javascript:report:
     - setup-test-env
   before_script: []
   script:
-    - date
-    - find app/ spec/ -name '*.js' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \; # run report over all files
     - date
     - yarn run eslint-report || true # ignore exit code
   artifacts:
diff --git a/package.json b/package.json
index 6a52af10dc3..cfe347c6eaa 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "dev-server": "nodemon -w 'config/webpack.config.js' --exec 'webpack-dev-server --config config/webpack.config.js'",
     "eslint": "eslint --max-warnings 0 --ext .js,.vue .",
     "eslint-fix": "eslint --max-warnings 0 --ext .js,.vue --fix .",
-    "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html .",
+    "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .",
     "karma": "BABEL_ENV=${BABEL_ENV:=karma} karma start --single-run true config/karma.config.js",
     "karma-coverage": "BABEL_ENV=coverage karma start --single-run true config/karma.config.js",
     "karma-start": "BABEL_ENV=karma karma start config/karma.config.js",
-- 
cgit v1.2.1


From 07e95b0cd48192804324a3c47729b5641df54fe6 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Mon, 18 Jun 2018 12:02:56 +0200
Subject: Expose whether current user can push into a branch on branches API

---
 changelogs/unreleased/dm-branch-api-can-push.yml    |  5 +++++
 doc/api/branches.md                                 | 11 ++++++++---
 lib/api/entities.rb                                 |  4 ++++
 spec/fixtures/api/schemas/public_api/v4/branch.json |  3 ++-
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/unreleased/dm-branch-api-can-push.yml

diff --git a/changelogs/unreleased/dm-branch-api-can-push.yml b/changelogs/unreleased/dm-branch-api-can-push.yml
new file mode 100644
index 00000000000..3be8962089b
--- /dev/null
+++ b/changelogs/unreleased/dm-branch-api-can-push.yml
@@ -0,0 +1,5 @@
+---
+title: Expose whether current user can push into a branch on branches API
+merge_request:
+author:
+type: added
diff --git a/doc/api/branches.md b/doc/api/branches.md
index 01bb30c3859..bfb21608d28 100644
--- a/doc/api/branches.md
+++ b/doc/api/branches.md
@@ -29,6 +29,7 @@ Example response:
     "protected": true,
     "developers_can_push": false,
     "developers_can_merge": false,
+    "can_push": true,
     "commit": {
       "author_email": "john@example.com",
       "author_name": "John Smith",
@@ -76,6 +77,7 @@ Example response:
   "protected": true,
   "developers_can_push": false,
   "developers_can_merge": false,
+  "can_push": true,
   "commit": {
     "author_email": "john@example.com",
     "author_name": "John Smith",
@@ -140,7 +142,8 @@ Example response:
   "merged": false,
   "protected": true,
   "developers_can_push": true,
-  "developers_can_merge": true
+  "developers_can_merge": true,
+  "can_push": true
 }
 ```
 
@@ -188,7 +191,8 @@ Example response:
   "merged": false,
   "protected": false,
   "developers_can_push": false,
-  "developers_can_merge": false
+  "developers_can_merge": false,
+  "can_push": true
 }
 ```
 
@@ -231,7 +235,8 @@ Example response:
   "merged": false,
   "protected": false,
   "developers_can_push": false,
-  "developers_can_merge": false
+  "developers_can_merge": false,
+  "can_push": true
 }
 ```
 
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 1cc8fcb8408..bb48a86fe9e 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -349,6 +349,10 @@ module API
       expose :developers_can_merge do |repo_branch, options|
         options[:project].protected_branches.developers_can?(:merge, repo_branch.name)
       end
+
+      expose :can_push do |repo_branch, options|
+        Gitlab::UserAccess.new(options[:current_user], project: options[:project]).can_push_to_branch?(repo_branch.name)
+      end
     end
 
     class TreeObject < Grape::Entity
diff --git a/spec/fixtures/api/schemas/public_api/v4/branch.json b/spec/fixtures/api/schemas/public_api/v4/branch.json
index a3581178974..a8891680d06 100644
--- a/spec/fixtures/api/schemas/public_api/v4/branch.json
+++ b/spec/fixtures/api/schemas/public_api/v4/branch.json
@@ -14,7 +14,8 @@
     "merged": { "type": "boolean" },
     "protected": { "type": "boolean" },
     "developers_can_push": { "type": "boolean" },
-    "developers_can_merge": { "type": "boolean" }
+    "developers_can_merge": { "type": "boolean" },
+    "can_push": { "type": "boolean" }
   },
   "additionalProperties": false
 }
-- 
cgit v1.2.1


From be24afcc2a75936b58aa9957239cdaa8e663bf98 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Mon, 18 Jun 2018 12:18:09 -0700
Subject: Fix integration table widths

---
 app/views/projects/services/_index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/services/_index.html.haml b/app/views/projects/services/_index.html.haml
index acbab8b85c9..16e48814578 100644
--- a/app/views/projects/services/_index.html.haml
+++ b/app/views/projects/services/_index.html.haml
@@ -8,7 +8,7 @@
       %colgroup
         %col
         %col
-        %col.d-none.d-sm-block
+        %col
         %col{ width: "120" }
       %thead
         %tr
-- 
cgit v1.2.1


From 17302f73bd2ee5758acc544eb516bc2c6e80d60d Mon Sep 17 00:00:00 2001
From: Joshua Lambert <joshua@gitlab.com>
Date: Tue, 19 Jun 2018 00:16:41 -0400
Subject: Clarify jupyterhub docs to indicate OAuth is enabled and HTTPS is not
 yet supported.

---
 doc/user/project/clusters/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 48bb2e543c1..58a483bb3b2 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -156,7 +156,7 @@ added directly to your configured cluster. Those applications are needed for
 | [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) | 10.2+ | Ingress can provide load balancing, SSL termination, and name-based virtual hosting. It acts as a web proxy for your applications and is useful if you want to use [Auto DevOps] or deploy your own web apps. |
 | [Prometheus](https://prometheus.io/docs/introduction/overview/) | 10.4+ | Prometheus is an open-source monitoring and alerting system useful to supervise your deployed applications |
 | [GitLab Runner](https://docs.gitlab.com/runner/) | 10.6+ | GitLab Runner is the open source project that is used to run your jobs and send the results back to GitLab. It is used in conjunction with [GitLab CI/CD](https://about.gitlab.com/features/gitlab-ci-cd/), the open-source continuous integration service included with GitLab that coordinates the jobs. When installing the GitLab Runner via the applications, it will run in **privileged mode** by default. Make sure you read the [security implications](#security-implications) before doing so. |
-| [JupyterHub](http://jupyter.org/) | 11.0+ | The Jupyter Notebook is an open-source web application that allows you to create and share documents that contain live code, equations, visualizations and narrative text. |
+| [JupyterHub](http://jupyter.org/) | 11.0+ | [JupyterHub](https://jupyterhub.readthedocs.io/en/stable/) is a multi-user service for managing notebooks across a team. [Jupyter Notebooks](https://jupyter-notebook.readthedocs.io/en/latest/) provide a web-based interactive programming environment used for data analysis, visualization, and machine learning. **Note**: Authentication will be enabled for any user of the GitLab server via OAuth2. HTTPS will be supported in a future release. |
 
 ## Getting the external IP address
 
-- 
cgit v1.2.1


From 1ac7c52e0d05f7e2d504e2d08db682ec324c1691 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Tue, 19 Jun 2018 12:28:09 +0200
Subject: Use Go 1.10 for source installations

---
 doc/install/installation.md | 10 +++++-----
 doc/update/10.8-to-11.0.md  | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 6cd1fb4c2d7..ef415246583 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -154,12 +154,12 @@ page](https://golang.org/dl).
 
     # Remove former Go installation folder
     sudo rm -rf /usr/local/go
-
-    curl --remote-name --progress https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz
-    echo '1862f4c3d3907e59b04a757cfda0ea7aa9ef39274af99a784f5be843c80c6772  go1.8.3.linux-amd64.tar.gz' | shasum -a256 -c - && \
-      sudo tar -C /usr/local -xzf go1.8.3.linux-amd64.tar.gz
+    
+    curl --remote-name --progress https://dl.google.com/go/go1.10.3.linux-amd64.tar.gz
+    echo 'fa1b0e45d3b647c252f51f5e1204aba049cde4af177ef9f2181f43004f901035  go1.10.3.linux-amd64.tar.gz' | shasum -a256 -c - && \
+      sudo tar -C /usr/local -xzf go1.10.3.linux-amd64.tar.gz
     sudo ln -sf /usr/local/go/bin/{go,godoc,gofmt} /usr/local/bin/
-    rm go1.8.3.linux-amd64.tar.gz
+    rm go1.10.3.linux-amd64.tar.gz
 
 ## 4. Node
 
diff --git a/doc/update/10.8-to-11.0.md b/doc/update/10.8-to-11.0.md
index 78a47ab939f..f9b6044bd2f 100644
--- a/doc/update/10.8-to-11.0.md
+++ b/doc/update/10.8-to-11.0.md
@@ -81,8 +81,8 @@ More information can be found on the [yarn website](https://yarnpkg.com/en/docs/
 
 ### 5. Update Go
 
-NOTE: GitLab 9.2 and higher only supports Go 1.8.3 and dropped support for Go
-1.5.x through 1.7.x. Be sure to upgrade your installation if necessary.
+NOTE: GitLab 11.0 and higher only supports Go 1.9.x and newer, and dropped support for Go
+1.5.x through 1.8.x. Be sure to upgrade your installation if necessary.
 
 You can check which version you are running with `go version`.
 
@@ -92,11 +92,11 @@ Download and install Go:
 # Remove former Go installation folder
 sudo rm -rf /usr/local/go
 
-curl --remote-name --progress https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz
-echo '1862f4c3d3907e59b04a757cfda0ea7aa9ef39274af99a784f5be843c80c6772  go1.8.3.linux-amd64.tar.gz' | shasum -a256 -c - && \
-  sudo tar -C /usr/local -xzf go1.8.3.linux-amd64.tar.gz
+curl --remote-name --progress https://dl.google.com/go/go1.10.3.linux-amd64.tar.gz
+echo 'fa1b0e45d3b647c252f51f5e1204aba049cde4af177ef9f2181f43004f901035  go1.10.3.linux-amd64.tar.gz' | shasum -a256 -c - && \
+  sudo tar -C /usr/local -xzf go1.10.3.linux-amd64.tar.gz
 sudo ln -sf /usr/local/go/bin/{go,godoc,gofmt} /usr/local/bin/
-rm go1.8.3.linux-amd64.tar.gz
+rm go1.10.3.linux-amd64.tar.gz
 ```
 
 ### 6. Get latest code
-- 
cgit v1.2.1


From 1dc0332726ffbcb488439e84373958753ee4ac5e Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Tue, 19 Jun 2018 12:17:54 +0200
Subject: Move forking to Gitaly

Closes https://gitlab.com/gitlab-org/gitaly/issues/817

Closes https://gitlab.com/gitlab-org/gitaly/issues/1236
---
 app/workers/repository_fork_worker.rb       | 26 +++++-----------------
 lib/gitlab/shell.rb                         | 17 ++-------------
 spec/lib/gitlab/shell_spec.rb               | 34 ++++++++---------------------
 spec/workers/repository_fork_worker_spec.rb | 10 ---------
 4 files changed, 16 insertions(+), 71 deletions(-)

diff --git a/app/workers/repository_fork_worker.rb b/app/workers/repository_fork_worker.rb
index db48bb7e8b8..dbb215f1964 100644
--- a/app/workers/repository_fork_worker.rb
+++ b/app/workers/repository_fork_worker.rb
@@ -8,28 +8,12 @@ class RepositoryForkWorker
     target_project_id = args.shift
     target_project = Project.find(target_project_id)
 
-    # By v10.8, we should've drained the queue of all jobs using the old arguments.
-    # We can remove the else clause if we're no longer logging the message in that clause.
-    # See https://gitlab.com/gitlab-org/gitaly/issues/1110
-    if args.empty?
-      source_project = target_project.forked_from_project
-      unless source_project
-        return target_project.mark_import_as_failed('Source project cannot be found.')
-      end
-
-      fork_repository(target_project, source_project.repository_storage, source_project.disk_path)
-    else
-      Rails.logger.info("Project #{target_project.id} is being forked using old-style arguments.")
-
-      source_repository_storage_path, source_disk_path = *args
-
-      source_repository_storage_name = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-        Gitlab.config.repositories.storages.find do |_, info|
-          info.legacy_disk_path == source_repository_storage_path
-        end&.first || raise("no shard found for path '#{source_repository_storage_path}'")
-      end
-      fork_repository(target_project, source_repository_storage_name, source_disk_path)
+    source_project = target_project.forked_from_project
+    unless source_project
+      return target_project.mark_import_as_failed('Source project cannot be found.')
     end
+
+    fork_repository(target_project, source_project.repository_storage, source_project.disk_path)
   end
 
   private
diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb
index 4b8aae4f5a2..5cedd9e84c2 100644
--- a/lib/gitlab/shell.rb
+++ b/lib/gitlab/shell.rb
@@ -1,5 +1,4 @@
-# Gitaly note: JV: two sets of straightforward RPC's. 1 Hard RPC: fork_repository.
-# SSH key operations are not part of Gitaly so will never be migrated.
+# Gitaly note: SSH key operations are not part of Gitaly so will never be migrated.
 
 require 'securerandom'
 
@@ -153,8 +152,6 @@ module Gitlab
     #
     # Ex.
     #   mv_repository("/path/to/storage", "gitlab/gitlab-ci", "randx/gitlab-ci-new")
-    #
-    # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/873
     def mv_repository(storage, path, new_path)
       return false if path.empty? || new_path.empty?
 
@@ -169,19 +166,11 @@ module Gitlab
     #
     # Ex.
     #  fork_repository("nfs-file06", "gitlab/gitlab-ci", "nfs-file07", "new-namespace/gitlab-ci")
-    #
-    # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/817
     def fork_repository(forked_from_storage, forked_from_disk_path, forked_to_storage, forked_to_disk_path)
       forked_from_relative_path = "#{forked_from_disk_path}.git"
       fork_args = [forked_to_storage, "#{forked_to_disk_path}.git"]
 
-      gitaly_migrate(:fork_repository, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
-        if is_enabled
-          GitalyGitlabProjects.new(forked_from_storage, forked_from_relative_path).fork_repository(*fork_args)
-        else
-          gitlab_projects(forked_from_storage, forked_from_relative_path).fork_repository(*fork_args)
-        end
-      end
+      GitalyGitlabProjects.new(forked_from_storage, forked_from_relative_path).fork_repository(*fork_args)
     end
 
     # Removes a repository from file system, using rm_diretory which is an alias
@@ -193,8 +182,6 @@ module Gitlab
     #
     # Ex.
     #   remove_repository("/path/to/storage", "gitlab/gitlab-ci")
-    #
-    # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/873
     def remove_repository(storage, name)
       return false if name.empty?
 
diff --git a/spec/lib/gitlab/shell_spec.rb b/spec/lib/gitlab/shell_spec.rb
index 155e1663298..c435f988cdd 100644
--- a/spec/lib/gitlab/shell_spec.rb
+++ b/spec/lib/gitlab/shell_spec.rb
@@ -498,34 +498,18 @@ describe Gitlab::Shell do
         )
       end
 
-      context 'with gitaly' do
-        it 'returns true when the command succeeds' do
-          expect_any_instance_of(Gitlab::GitalyClient::RepositoryService).to receive(:fork_repository)
-            .with(repository.raw_repository) { :gitaly_response_object }
-
-          is_expected.to be_truthy
-        end
-
-        it 'return false when the command fails' do
-          expect_any_instance_of(Gitlab::GitalyClient::RepositoryService).to receive(:fork_repository)
-            .with(repository.raw_repository) { raise GRPC::BadStatus, 'bla' }
+      it 'returns true when the command succeeds' do
+        expect_any_instance_of(Gitlab::GitalyClient::RepositoryService).to receive(:fork_repository)
+          .with(repository.raw_repository) { :gitaly_response_object }
 
-          is_expected.to be_falsy
-        end
+        is_expected.to be_truthy
       end
 
-      context 'without gitaly', :disable_gitaly do
-        it 'returns true when the command succeeds' do
-          expect(gitlab_projects).to receive(:fork_repository).with('nfs-file05', 'fork/path.git') { true }
-
-          is_expected.to be_truthy
-        end
-
-        it 'return false when the command fails' do
-          expect(gitlab_projects).to receive(:fork_repository).with('nfs-file05', 'fork/path.git') { false }
+      it 'return false when the command fails' do
+        expect_any_instance_of(Gitlab::GitalyClient::RepositoryService).to receive(:fork_repository)
+          .with(repository.raw_repository) { raise GRPC::BadStatus, 'bla' }
 
-          is_expected.to be_falsy
-        end
+        is_expected.to be_falsy
       end
     end
 
@@ -665,7 +649,7 @@ describe Gitlab::Shell do
 
         subject do
           gitlab_shell.fetch_remote(repository.raw_repository, remote_name,
-            forced: true, no_tags: true, ssh_auth: ssh_auth)
+                                    forced: true, no_tags: true, ssh_auth: ssh_auth)
         end
 
         it 'passes the correct params to the gitaly service' do
diff --git a/spec/workers/repository_fork_worker_spec.rb b/spec/workers/repository_fork_worker_spec.rb
index 5d83397e8df..ac8716ecfb1 100644
--- a/spec/workers/repository_fork_worker_spec.rb
+++ b/spec/workers/repository_fork_worker_spec.rb
@@ -92,16 +92,6 @@ describe RepositoryForkWorker do
       end
 
       it_behaves_like 'RepositoryForkWorker performing'
-
-      it 'logs a message about forking with old-style arguments' do
-        allow(subject).to receive(:gitlab_shell).and_return(shell)
-        expect(shell).to receive(:fork_repository) { true }
-
-        allow(Rails.logger).to receive(:info).with(anything) # To compensate for other logs
-        expect(Rails.logger).to receive(:info).with("Project #{fork_project.id} is being forked using old-style arguments.")
-
-        perform!
-      end
     end
   end
 end
-- 
cgit v1.2.1


From a1e1d64000da97cf61e9b3191c012ec213eb1812 Mon Sep 17 00:00:00 2001
From: Matthieu Fronton <m@tthieu.fr>
Date: Tue, 19 Jun 2018 12:53:00 +0000
Subject: Point out the specific anchor inside the document

---
 doc/user/project/integrations/microsoft_teams.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/user/project/integrations/microsoft_teams.md b/doc/user/project/integrations/microsoft_teams.md
index eaad2d5138a..5cf80a298ad 100644
--- a/doc/user/project/integrations/microsoft_teams.md
+++ b/doc/user/project/integrations/microsoft_teams.md
@@ -2,7 +2,7 @@
 
 ## On Microsoft Teams
 
-To enable Microsoft Teams integration you must create an incoming webhook integration on Microsoft Teams by following the steps described in this [document](https://msdn.microsoft.com/en-us/microsoft-teams/connectors).
+To enable Microsoft Teams integration you must create an incoming webhook integration on Microsoft Teams by following the steps described in this [document](https://docs.microsoft.com/en-us/microsoftteams/platform/concepts/connectors#setting-up-a-custom-incoming-webhook).
 
 ## On GitLab
 
-- 
cgit v1.2.1


From 5607c57c41a57cb6cbd8c2df90ad0cda6138964a Mon Sep 17 00:00:00 2001
From: "Balasankar \"Balu\" C" <balasankar@gitlab.com>
Date: Tue, 19 Jun 2018 18:39:47 +0530
Subject: Use gitaly to figure out git version for usage ping

---
 lib/gitlab/git/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/git/version.rb b/lib/gitlab/git/version.rb
index 11184ca3457..1e14e8b652a 100644
--- a/lib/gitlab/git/version.rb
+++ b/lib/gitlab/git/version.rb
@@ -4,7 +4,7 @@ module Gitlab
       extend Gitlab::Git::Popen
 
       def self.git_version
-        Gitlab::VersionInfo.parse(popen(%W(#{Gitlab.config.git.bin_path} --version), nil).first)
+        Gitlab::VersionInfo.parse(Gitaly::Server.all.first.git_binary_version)
       end
     end
   end
-- 
cgit v1.2.1


From 73be160cf1bc2d114a936841fb9c4b830fdf315f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 18 Jun 2018 16:41:20 +0200
Subject: Make Page::Main::Login#sign_in_using_credentials gracefully bail out
 when user is already logged-in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 qa/qa/page/main/login.rb | 65 ++++++++++++++++++++++++++----------------------
 qa/qa/page/menu/main.rb  |  3 ++-
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index 596205fe540..26c99efc53d 100644
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -26,53 +26,58 @@ module QA
         end
 
         def initialize
+          # The login page is usually the entry point for all the scenarios so
+          # we need to wait for the instance to start. That said, in some cases
+          # we are already logged-in so we check both cases here.
           wait(max: 500) do
-            page.has_css?('.application')
+            page.has_css?('.login-page') ||
+              Page::Menu::Main.act { has_personal_area? }
           end
         end
 
-        def set_initial_password_if_present
-          if page.has_content?('Change your password')
-            fill_in :user_password, with: Runtime::User.password
-            fill_in :user_password_confirmation, with: Runtime::User.password
-            click_button 'Change your password'
+        def sign_in_using_credentials
+          # Don't try to log-in if we're already logged-in
+          return if Page::Menu::Main.act { has_personal_area? }
+
+          using_wait_time 0 do
+            set_initial_password_if_present
+
+            if Runtime::User.ldap_user?
+              sign_in_using_ldap_credentials
+            else
+              sign_in_using_gitlab_credentials
+            end
           end
         end
 
-        def sign_in_using_credentials
-          if Runtime::User.ldap_user?
-            sign_in_using_ldap_credentials
-          else
-            sign_in_using_gitlab_credentials
-          end
+        def self.path
+          '/users/sign_in'
         end
 
-        def sign_in_using_ldap_credentials
-          using_wait_time 0 do
-            set_initial_password_if_present
+        private
 
-            click_link 'LDAP'
+        def sign_in_using_ldap_credentials
+          click_link 'LDAP'
 
-            fill_in :username, with: Runtime::User.ldap_username
-            fill_in :password, with: Runtime::User.ldap_password
-            click_button 'Sign in'
-          end
+          fill_in :username, with: Runtime::User.ldap_username
+          fill_in :password, with: Runtime::User.ldap_password
+          click_button 'Sign in'
         end
 
         def sign_in_using_gitlab_credentials
-          using_wait_time 0 do
-            set_initial_password_if_present
-
-            click_link 'Standard' if page.has_content?('LDAP')
+          click_link 'Standard' if page.has_content?('LDAP')
 
-            fill_in :user_login, with: Runtime::User.name
-            fill_in :user_password, with: Runtime::User.password
-            click_button 'Sign in'
-          end
+          fill_in :user_login, with: Runtime::User.name
+          fill_in :user_password, with: Runtime::User.password
+          click_button 'Sign in'
         end
 
-        def self.path
-          '/users/sign_in'
+        def set_initial_password_if_present
+          return unless page.has_content?('Change your password')
+
+          fill_in :user_password, with: Runtime::User.password
+          fill_in :user_password_confirmation, with: Runtime::User.password
+          click_button 'Change your password'
         end
       end
     end
diff --git a/qa/qa/page/menu/main.rb b/qa/qa/page/menu/main.rb
index 644fedecc90..fda9c45c091 100644
--- a/qa/qa/page/menu/main.rb
+++ b/qa/qa/page/menu/main.rb
@@ -55,7 +55,8 @@ module QA
         end
 
         def has_personal_area?
-          page.has_selector?('.qa-user-avatar')
+          # No need to wait, either we're logged-in, or not.
+          using_wait_time(0) { page.has_selector?('.qa-user-avatar') }
         end
 
         private
-- 
cgit v1.2.1


From c2cdefd4413e2b9946d2a50461b338fc60cef1af Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Tue, 19 Jun 2018 15:01:36 +0200
Subject: Force push is handled by Gitaly now

Closes gitlab-org/gitaly#348
---
 lib/gitlab/checks/force_push.rb           | 16 ++++------------
 lib/gitlab/git/repository.rb              |  4 ----
 lib/gitlab/git/rev_list.rb                |  9 ---------
 spec/lib/gitlab/checks/force_push_spec.rb | 18 +++++++-----------
 spec/lib/gitlab/git/rev_list_spec.rb      | 10 ----------
 5 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/lib/gitlab/checks/force_push.rb b/lib/gitlab/checks/force_push.rb
index c9c3050cfc2..87af4a90572 100644
--- a/lib/gitlab/checks/force_push.rb
+++ b/lib/gitlab/checks/force_push.rb
@@ -7,18 +7,10 @@ module Gitlab
         # Created or deleted branch
         return false if Gitlab::Git.blank_ref?(oldrev) || Gitlab::Git.blank_ref?(newrev)
 
-        GitalyClient.migrate(:force_push) do |is_enabled|
-          if is_enabled
-            !project
-              .repository
-              .gitaly_commit_client
-              .ancestor?(oldrev, newrev)
-          else
-            Gitlab::Git::RevList.new(
-              project.repository.raw, oldrev: oldrev, newrev: newrev
-            ).missed_ref.present?
-          end
-        end
+        !project
+          .repository
+          .gitaly_commit_client
+          .ancestor?(oldrev, newrev)
       end
     end
   end
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index d12672fc0e6..27a86054a86 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1476,10 +1476,6 @@ module Gitlab
         run_git!(args, lazy_block: block)
       end
 
-      def missed_ref(oldrev, newrev)
-        run_git!(['rev-list', '--max-count=1', oldrev, "^#{newrev}"])
-      end
-
       def with_worktree(worktree_path, branch, sparse_checkout_files: nil, env:)
         base_args = %w(worktree add --detach)
 
diff --git a/lib/gitlab/git/rev_list.rb b/lib/gitlab/git/rev_list.rb
index 4e661eceffb..5fdad077eea 100644
--- a/lib/gitlab/git/rev_list.rb
+++ b/lib/gitlab/git/rev_list.rb
@@ -1,5 +1,3 @@
-# Gitaly note: JV: will probably be migrated indirectly by migrating the call sites.
-
 module Gitlab
   module Git
     class RevList
@@ -45,13 +43,6 @@ module Gitlab
                     &lazy_block)
       end
 
-      # This methods returns an array of missed references
-      #
-      # Should become obsolete after https://gitlab.com/gitlab-org/gitaly/issues/348.
-      def missed_ref
-        repository.missed_ref(oldrev, newrev).split("\n")
-      end
-
       private
 
       def execute(args)
diff --git a/spec/lib/gitlab/checks/force_push_spec.rb b/spec/lib/gitlab/checks/force_push_spec.rb
index a65012d2314..0e0788ce974 100644
--- a/spec/lib/gitlab/checks/force_push_spec.rb
+++ b/spec/lib/gitlab/checks/force_push_spec.rb
@@ -1,21 +1,17 @@
 require 'spec_helper'
 
 describe Gitlab::Checks::ForcePush do
-  let(:project) { create(:project, :repository) }
-  let(:repository) { project.repository.raw }
+  set(:project) { create(:project, :repository) }
 
-  context "exit code checking", :skip_gitaly_mock do
-    it "does not raise a runtime error if the `popen` call to git returns a zero exit code" do
-      allow(repository).to receive(:popen).and_return(['normal output', 0])
+  describe '.force_push?' do
+    it 'returns false if the repo is empty' do
+      allow(project).to receive(:empty_repo?).and_return(true)
 
-      expect { described_class.force_push?(project, 'oldrev', 'newrev') }.not_to raise_error
+      expect(described_class.force_push?(project, 'HEAD', 'HEAD~')).to be(false)
     end
 
-    it "raises a GitError error if the `popen` call to git returns a non-zero exit code" do
-      allow(repository).to receive(:popen).and_return(['error', 1])
-
-      expect { described_class.force_push?(project, 'oldrev', 'newrev') }
-        .to raise_error(Gitlab::Git::Repository::GitError)
+    it 'checks if old rev is an anchestor' do
+      expect(described_class.force_push?(project, 'HEAD', 'HEAD~')).to be(true)
     end
   end
 end
diff --git a/spec/lib/gitlab/git/rev_list_spec.rb b/spec/lib/gitlab/git/rev_list_spec.rb
index 95dc47e2a00..b752c3e8341 100644
--- a/spec/lib/gitlab/git/rev_list_spec.rb
+++ b/spec/lib/gitlab/git/rev_list_spec.rb
@@ -93,14 +93,4 @@ describe Gitlab::Git::RevList do
       expect { |b| rev_list.all_objects(&b) }.to yield_with_args(%w[sha1 sha2])
     end
   end
-
-  context "#missed_ref" do
-    let(:rev_list) { described_class.new(repository, oldrev: 'oldrev', newrev: 'newrev') }
-
-    it 'calls out to `popen`' do
-      stub_popen_rev_list('--max-count=1', 'oldrev', '^newrev', with_lazy_block: false, output: "sha1\nsha2")
-
-      expect(rev_list.missed_ref).to eq(%w[sha1 sha2])
-    end
-  end
 end
-- 
cgit v1.2.1


From 64cda7746c08939306a6b98751d5a5c5280cc5b9 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Tue, 19 Jun 2018 15:57:27 +0200
Subject: LFS changes are detected by Gitaly

Closes https://gitlab.com/gitlab-org/gitaly/issues/935
---
 lib/gitlab/git/lfs_changes.rb           | 60 ++-------------------------------
 spec/lib/gitlab/git/lfs_changes_spec.rb | 41 +++-------------------
 2 files changed, 7 insertions(+), 94 deletions(-)

diff --git a/lib/gitlab/git/lfs_changes.rb b/lib/gitlab/git/lfs_changes.rb
index f3cc388ea41..f0fab1e76a3 100644
--- a/lib/gitlab/git/lfs_changes.rb
+++ b/lib/gitlab/git/lfs_changes.rb
@@ -7,67 +7,11 @@ module Gitlab
       end
 
       def new_pointers(object_limit: nil, not_in: nil)
-        @repository.gitaly_migrate(:blob_get_new_lfs_pointers) do |is_enabled|
-          if is_enabled
-            @repository.gitaly_blob_client.get_new_lfs_pointers(@newrev, object_limit, not_in)
-          else
-            git_new_pointers(object_limit, not_in)
-          end
-        end
+        @repository.gitaly_blob_client.get_new_lfs_pointers(@newrev, object_limit, not_in)
       end
 
       def all_pointers
-        @repository.gitaly_migrate(:blob_get_all_lfs_pointers) do |is_enabled|
-          if is_enabled
-            @repository.gitaly_blob_client.get_all_lfs_pointers(@newrev)
-          else
-            git_all_pointers
-          end
-        end
-      end
-
-      private
-
-      def git_new_pointers(object_limit, not_in)
-        @new_pointers ||= begin
-          rev_list.new_objects(rev_list_params(not_in: not_in)) do |object_ids|
-            object_ids = object_ids.take(object_limit) if object_limit
-
-            Gitlab::Git::Blob.batch_lfs_pointers(@repository, object_ids)
-          end
-        end
-      end
-
-      def git_all_pointers
-        params = {}
-        if rev_list_supports_new_options?
-          params[:options] = ["--filter=blob:limit=#{Gitlab::Git::Blob::LFS_POINTER_MAX_SIZE}"]
-        end
-
-        rev_list.all_objects(rev_list_params(params)) do |object_ids|
-          Gitlab::Git::Blob.batch_lfs_pointers(@repository, object_ids)
-        end
-      end
-
-      def rev_list
-        Gitlab::Git::RevList.new(@repository, newrev: @newrev)
-      end
-
-      # We're passing the `--in-commit-order` arg to ensure we don't wait
-      # for git to traverse all commits before returning pointers.
-      # This is required in order to improve the performance of LFS integrity check
-      def rev_list_params(params = {})
-        params[:options] ||= []
-        params[:options] << "--in-commit-order" if rev_list_supports_new_options?
-        params[:require_path] = true
-
-        params
-      end
-
-      def rev_list_supports_new_options?
-        return @option_supported if defined?(@option_supported)
-
-        @option_supported = Gitlab::Git.version >= Gitlab::VersionInfo.parse('2.16.0')
+        @repository.gitaly_blob_client.get_all_lfs_pointers(@newrev)
       end
     end
   end
diff --git a/spec/lib/gitlab/git/lfs_changes_spec.rb b/spec/lib/gitlab/git/lfs_changes_spec.rb
index d0dd8c6303f..c5e7ab959b2 100644
--- a/spec/lib/gitlab/git/lfs_changes_spec.rb
+++ b/spec/lib/gitlab/git/lfs_changes_spec.rb
@@ -1,50 +1,19 @@
 require 'spec_helper'
 
 describe Gitlab::Git::LfsChanges do
-  let(:project) { create(:project, :repository) }
+  set(:project) { create(:project, :repository) }
   let(:newrev) { '54fcc214b94e78d7a41a9a8fe6d87a5e59500e51' }
   let(:blob_object_id) { '0c304a93cb8430108629bbbcaa27db3343299bc0' }
 
   subject { described_class.new(project.repository, newrev) }
 
   describe '#new_pointers' do
-    shared_examples 'new pointers' do
-      it 'filters new objects to find lfs pointers' do
-        expect(subject.new_pointers(not_in: []).first.id).to eq(blob_object_id)
-      end
-
-      it 'limits new_objects using object_limit' do
-        expect(subject.new_pointers(object_limit: 1)).to eq([])
-      end
-    end
-
-    context 'with gitaly enabled' do
-      it_behaves_like 'new pointers'
+    it 'filters new objects to find lfs pointers' do
+      expect(subject.new_pointers(not_in: []).first.id).to eq(blob_object_id)
     end
 
-    context 'with gitaly disabled', :skip_gitaly_mock do
-      it_behaves_like 'new pointers'
-
-      it 'uses rev-list to find new objects' do
-        rev_list = double
-        allow(Gitlab::Git::RevList).to receive(:new).and_return(rev_list)
-
-        expect(rev_list).to receive(:new_objects).and_return([])
-
-        subject.new_pointers
-      end
-    end
-  end
-
-  describe '#all_pointers', :skip_gitaly_mock do
-    it 'uses rev-list to find all objects' do
-      rev_list = double
-      allow(Gitlab::Git::RevList).to receive(:new).and_return(rev_list)
-      allow(rev_list).to receive(:all_objects).and_yield([blob_object_id])
-
-      expect(Gitlab::Git::Blob).to receive(:batch_lfs_pointers).with(project.repository, [blob_object_id])
-
-      subject.all_pointers
+    it 'limits new_objects using object_limit' do
+      expect(subject.new_pointers(object_limit: 1)).to eq([])
     end
   end
 end
-- 
cgit v1.2.1


From 5308b51ef43dceb3832edb4156bf3ece51099b67 Mon Sep 17 00:00:00 2001
From: Ahmad Hassan <ahmad.hassan612@gmail.com>
Date: Mon, 18 Jun 2018 16:42:39 +0200
Subject: Output done for wiki and repo

---
 lib/backup/repository.rb | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 127c2477810..605a913cc6f 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -4,7 +4,6 @@ require_relative 'helper'
 module Backup
   class Repository
     include Backup::Helper
-    # rubocop:disable Metrics/AbcSize
 
     attr_reader :progress
 
@@ -16,7 +15,6 @@ module Backup
       prepare
 
       Project.find_each(batch_size: 1000) do |project|
-        # Create namespace dir or hashed path if missing
         progress.print " * #{display_repo_path(project)} ... "
 
         if project.hashed_storage?(:repository)
@@ -27,22 +25,19 @@ module Backup
 
         if !empty_repo?(project)
           backup_project(project)
+          progress.puts "[DONE]".color(:green)
         else
           progress.puts "[SKIPPED]".color(:cyan)
         end
 
         wiki = ProjectWiki.new(project)
-        path_to_wiki_repo = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-          path_to_repo(wiki)
-        end
 
-        if File.exist?(path_to_wiki_repo) && !empty_repo?(wiki)
+        if !empty_repo?(wiki)
           backup_project(wiki)
+          progress.puts "[DONE] Wiki".color(:green)
         else
           progress.puts "[SKIPPED] Wiki".color(:cyan)
         end
-
-        progress.puts "[DONE]".color(:green)
       end
     end
 
@@ -100,8 +95,6 @@ module Backup
       path = repository_storage.legacy_disk_path
       return unless File.exist?(path)
 
-      # Move all files in the existing repos directory except . and .. to
-      # repositories.old.<timestamp> directory
       bk_repos_path = File.join(Gitlab.config.backup.path, "tmp", "#{name}-repositories.old." + Time.now.to_i.to_s)
       FileUtils.mkdir_p(bk_repos_path, mode: 0700)
       files = Dir.glob(File.join(path, "*"), File::FNM_DOTMATCH) - [File.join(path, "."), File.join(path, "..")]
@@ -223,7 +216,6 @@ module Backup
         end
       end
     end
-    # rubocop:enable Metrics/AbcSize
 
     protected
 
@@ -261,9 +253,7 @@ module Backup
 
     def prepare
       FileUtils.rm_rf(backup_repos_path)
-      # Ensure the parent dir of backup_repos_path exists
       FileUtils.mkdir_p(Gitlab.config.backup.path)
-      # Fail if somebody raced to create backup_repos_path before us
       FileUtils.mkdir(backup_repos_path, mode: 0700)
     end
 
@@ -279,7 +269,6 @@ module Backup
     end
 
     def empty_repo?(project_or_wiki)
-      # Protect against stale caches
       project_or_wiki.repository.expire_emptiness_caches
       project_or_wiki.repository.empty?
     end
-- 
cgit v1.2.1


From 59b91de52de1e2cce416825887ec2f9ca8fe019b Mon Sep 17 00:00:00 2001
From: Jose <jvargas@gitlab.com>
Date: Mon, 18 Jun 2018 17:26:54 -0500
Subject: Fix cancel automatic merge button height

---
 app/assets/stylesheets/pages/merge_requests.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 99fe4a578be..596d3aa171c 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -46,6 +46,7 @@
 
   .btn {
     font-size: $gl-font-size;
+    max-height: 26px;
 
     &[disabled] {
       opacity: 0.3;
-- 
cgit v1.2.1


From 9d5f5c43119197b9c522ae121af5564f43d06574 Mon Sep 17 00:00:00 2001
From: Mario de la Ossa <mariodelaossa@gmail.com>
Date: Tue, 19 Jun 2018 09:27:09 -0600
Subject: Fix redis_cacheable deserialization

---
 app/models/concerns/redis_cacheable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/redis_cacheable.rb b/app/models/concerns/redis_cacheable.rb
index b5425295130..3bdc1330d23 100644
--- a/app/models/concerns/redis_cacheable.rb
+++ b/app/models/concerns/redis_cacheable.rb
@@ -48,7 +48,7 @@ module RedisCacheable
 
   def cast_value_from_cache(attribute, value)
     if Gitlab.rails5?
-      self.class.type_for_attribute(attribute).cast(value)
+      self.class.type_for_attribute(attribute.to_s).cast(value)
     else
       self.class.column_for_attribute(attribute).type_cast_from_database(value)
     end
-- 
cgit v1.2.1


From 7357209f91ae4c0b504f47e36220bd04a0e2feca Mon Sep 17 00:00:00 2001
From: Mario de la Ossa <mariodelaossa@gmail.com>
Date: Wed, 6 Jun 2018 18:14:10 -0600
Subject: Implement filtering by filename on code search

---
 changelogs/unreleased/ce-5024-filename-search.yml |  5 +++
 doc/api/search.md                                 |  9 ++++
 lib/gitlab/file_finder.rb                         | 17 ++++---
 lib/gitlab/search/parsed_query.rb                 | 23 ++++++++++
 lib/gitlab/search/query.rb                        | 55 +++++++++++++++++++++++
 spec/lib/gitlab/file_finder_spec.rb               | 20 ++++++++-
 spec/lib/gitlab/search/query_spec.rb              | 39 ++++++++++++++++
 spec/requests/api/search_spec.rb                  | 24 ++++++++++
 8 files changed, 186 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/ce-5024-filename-search.yml
 create mode 100644 lib/gitlab/search/parsed_query.rb
 create mode 100644 lib/gitlab/search/query.rb
 create mode 100644 spec/lib/gitlab/search/query_spec.rb

diff --git a/changelogs/unreleased/ce-5024-filename-search.yml b/changelogs/unreleased/ce-5024-filename-search.yml
new file mode 100644
index 00000000000..a8bf9b1f802
--- /dev/null
+++ b/changelogs/unreleased/ce-5024-filename-search.yml
@@ -0,0 +1,5 @@
+---
+title: Add filename filtering to code search
+merge_request: 19509
+author:
+type: added
diff --git a/doc/api/search.md b/doc/api/search.md
index 107ddaffa6a..9716f682ace 100644
--- a/doc/api/search.md
+++ b/doc/api/search.md
@@ -776,6 +776,15 @@ Example response:
 
 ### Scope: blobs
 
+Filters are available for this scope:
+- filename
+- path
+- extension
+
+to use a filter simply include it in your query like so: `a query filename:some_name*`.
+
+You may use wildcards (`*`) to use glob matching.
+
 ```bash
 curl --request GET --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/6/search?scope=blobs&search=installation
 ```
diff --git a/lib/gitlab/file_finder.rb b/lib/gitlab/file_finder.rb
index f42088f980e..af8270c8db8 100644
--- a/lib/gitlab/file_finder.rb
+++ b/lib/gitlab/file_finder.rb
@@ -14,14 +14,21 @@ module Gitlab
     end
 
     def find(query)
-      by_content = find_by_content(query)
+      query = Gitlab::Search::Query.new(query) do
+        filter :filename, matcher: ->(filter, blob) { blob.filename =~ /#{filter[:regex_value]}$/i }
+        filter :path, matcher: ->(filter, blob) { blob.filename =~ /#{filter[:regex_value]}/i }
+        filter :extension, matcher: ->(filter, blob) { blob.filename =~ /\.#{filter[:regex_value]}$/i }
+      end
+
+      by_content = find_by_content(query.term)
 
       already_found = Set.new(by_content.map(&:filename))
-      by_filename = find_by_filename(query, except: already_found)
+      by_filename = find_by_filename(query.term, except: already_found)
+
+      files = (by_content + by_filename)
+              .sort_by(&:filename)
 
-      (by_content + by_filename)
-        .sort_by(&:filename)
-        .map { |blob| [blob.filename, blob] }
+      query.filter_results(files).map { |blob| [blob.filename, blob] }
     end
 
     private
diff --git a/lib/gitlab/search/parsed_query.rb b/lib/gitlab/search/parsed_query.rb
new file mode 100644
index 00000000000..23595f23f01
--- /dev/null
+++ b/lib/gitlab/search/parsed_query.rb
@@ -0,0 +1,23 @@
+module Gitlab
+  module Search
+    class ParsedQuery
+      attr_reader :term, :filters
+
+      def initialize(term, filters)
+        @term = term
+        @filters = filters
+      end
+
+      def filter_results(results)
+        filters = @filters.reject { |filter| filter[:matcher].nil? }
+        return unless filters
+
+        results.select do |result|
+          filters.all? do |filter|
+            filter[:matcher].call(filter, result)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/search/query.rb b/lib/gitlab/search/query.rb
new file mode 100644
index 00000000000..8583bce7792
--- /dev/null
+++ b/lib/gitlab/search/query.rb
@@ -0,0 +1,55 @@
+module Gitlab
+  module Search
+    class Query < SimpleDelegator
+      def initialize(query, filter_opts = {}, &block)
+        @raw_query = query.dup
+        @filters = []
+        @filter_options = { default_parser: :downcase.to_proc }.merge(filter_opts)
+
+        self.instance_eval(&block) if block_given?
+
+        @query = Gitlab::Search::ParsedQuery.new(*extract_filters)
+        # set the ParsedQuery as our default delegator thanks to SimpleDelegator
+        super(@query)
+      end
+
+      private
+
+      def filter(name, **attributes)
+        filter = { parser: @filter_options[:default_parser], name: name }.merge(attributes)
+
+        @filters << filter
+      end
+
+      def filter_options(**options)
+        @filter_options.merge!(options)
+      end
+
+      def extract_filters
+        fragments = []
+
+        filters = @filters.each_with_object([]) do |filter, parsed_filters|
+          match = @raw_query.split.find { |part| part =~ /\A#{filter[:name]}:/ }
+          next unless match
+
+          input = match.split(':')[1..-1].join
+          next if input.empty?
+
+          filter[:value] = parse_filter(filter, input)
+          filter[:regex_value] = Regexp.escape(filter[:value]).gsub('\*', '.*?')
+          fragments << match
+
+          parsed_filters << filter
+        end
+
+        query = (@raw_query.split - fragments).join(' ')
+
+        [query, filters]
+      end
+
+      def parse_filter(filter, input)
+        filter[:parser].call(input)
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/file_finder_spec.rb b/spec/lib/gitlab/file_finder_spec.rb
index d6d9e4001a3..b49c5817131 100644
--- a/spec/lib/gitlab/file_finder_spec.rb
+++ b/spec/lib/gitlab/file_finder_spec.rb
@@ -3,11 +3,29 @@ require 'spec_helper'
 describe Gitlab::FileFinder do
   describe '#find' do
     let(:project) { create(:project, :public, :repository) }
+    subject { described_class.new(project, project.default_branch) }
 
     it_behaves_like 'file finder' do
-      subject { described_class.new(project, project.default_branch) }
       let(:expected_file_by_name) { 'files/images/wm.svg' }
       let(:expected_file_by_content) { 'CHANGELOG' }
     end
+
+    it 'filters by name' do
+      results = subject.find('files filename:wm.svg')
+
+      expect(results.count).to eq(1)
+    end
+
+    it 'filters by path' do
+      results = subject.find('white path:images')
+
+      expect(results.count).to eq(1)
+    end
+
+    it 'filters by extension' do
+      results = subject.find('files extension:svg')
+
+      expect(results.count).to eq(1)
+    end
   end
 end
diff --git a/spec/lib/gitlab/search/query_spec.rb b/spec/lib/gitlab/search/query_spec.rb
new file mode 100644
index 00000000000..2d00428fffa
--- /dev/null
+++ b/spec/lib/gitlab/search/query_spec.rb
@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Gitlab::Search::Query do
+  let(:query) { 'base filter:wow anotherfilter:noway name:maybe other:mmm leftover' }
+  let(:subject) do
+    described_class.new(query) do
+      filter :filter
+      filter :name, parser: :upcase.to_proc
+      filter :other
+    end
+  end
+
+  it { expect(described_class).to be < SimpleDelegator }
+
+  it 'leaves undefined filters in the main query' do
+    expect(subject.term).to eq('base anotherfilter:noway leftover')
+  end
+
+  it 'parses filters' do
+    expect(subject.filters.count).to eq(3)
+    expect(subject.filters.map { |f| f[:value] }).to match_array(%w[wow MAYBE mmm])
+  end
+
+  context 'with an empty filter' do
+    let(:query) { 'some bar name: baz' }
+
+    it 'ignores empty filters' do
+      expect(subject.term).to eq('some bar name: baz')
+    end
+  end
+
+  context 'with a pipe' do
+    let(:query) { 'base | nofilter' }
+
+    it 'does not escape the pipe' do
+      expect(subject.term).to eq(query)
+    end
+  end
+end
diff --git a/spec/requests/api/search_spec.rb b/spec/requests/api/search_spec.rb
index aca4aa40027..f8e468be170 100644
--- a/spec/requests/api/search_spec.rb
+++ b/spec/requests/api/search_spec.rb
@@ -312,6 +312,30 @@ describe API::Search do
         end
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/blobs', size: 2
+
+        context 'filters' do
+          it 'by filename' do
+            get api("/projects/#{repo_project.id}/search", user), scope: 'blobs', search: 'mon filename:PROCESS.md'
+
+            expect(response).to have_gitlab_http_status(200)
+            expect(json_response.size).to eq(2)
+            expect(json_response.first['filename']).to eq('PROCESS.md')
+          end
+
+          it 'by path' do
+            get api("/projects/#{repo_project.id}/search", user), scope: 'blobs', search: 'mon path:markdown'
+
+            expect(response).to have_gitlab_http_status(200)
+            expect(json_response.size).to eq(8)
+          end
+
+          it 'by extension' do
+            get api("/projects/#{repo_project.id}/search", user), scope: 'blobs', search: 'mon extension:md'
+
+            expect(response).to have_gitlab_http_status(200)
+            expect(json_response.size).to eq(11)
+          end
+        end
       end
     end
   end
-- 
cgit v1.2.1


From 9a65af63e050ce1a44ef3c9feed35a4e1b96929d Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Tue, 19 Jun 2018 16:39:34 +0100
Subject: Add docs for the cleanup step of a background column type change

A background column type change needs a cleanup step, like any background
migration. We should call that out explicitly in the documentation.
---
 doc/development/what_requires_downtime.md | 47 +++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/doc/development/what_requires_downtime.md b/doc/development/what_requires_downtime.md
index b8be8daa157..f502866333e 100644
--- a/doc/development/what_requires_downtime.md
+++ b/doc/development/what_requires_downtime.md
@@ -252,6 +252,53 @@ Keep in mind that the relation passed to
 `change_column_type_using_background_migration` _must_ include `EachBatch`,
 otherwise it will raise a `TypeError`.
 
+This migration then needs to be followed in a separate release (_not_ a patch
+release) by a cleanup migration, which should steal from the queue and handle
+any remaining rows. For example:
+
+```ruby
+class MigrateRemainingIssuesClosedAt < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  class Issue < ActiveRecord::Base
+    self.table_name = 'issues'
+    include EachBatch
+  end
+
+  def up
+    Gitlab::BackgroundMigration.steal('CopyColumn')
+    Gitlab::BackgroundMigration.steal('CleanupConcurrentTypeChange')
+
+    migrate_remaining_rows if migrate_column_type?
+  end
+
+  def down
+    # Previous migrations already revert the changes made here.
+  end
+
+  def migrate_remaining_rows
+    Issue.where('closed_at_for_type_change IS NULL AND closed_at IS NOT NULL').each_batch do |batch|
+      batch.update_all('closed_at_for_type_change = closed_at')
+    end
+
+    cleanup_concurrent_column_type_change(:issues, :closed_at)
+  end
+
+  def migrate_column_type?
+    # Some environments may have already executed the previous version of this
+    # migration, thus we don't need to migrate those environments again.
+    column_for('issues', 'closed_at').type == :datetime # rubocop:disable Migration/Datetime
+  end
+end
+```
+
+For more information, see [the documentation on cleaning up background
+migrations](background_migrations.md#cleaning-up).
+
 ## Adding Indexes
 
 Adding indexes is an expensive process that blocks INSERT and UPDATE queries for
-- 
cgit v1.2.1


From dea03a0815ddceeadbb809cd4ed94f6603e4c411 Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <cokoghenun@gitlab.com>
Date: Tue, 19 Jun 2018 16:43:57 +0000
Subject: =?UTF-8?q?Resolve=20"Remove=20=E2=80=9Ccommented=E2=80=9D=20from?=
 =?UTF-8?q?=20comment=20system=20notes"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/javascripts/notes/components/noteable_note.vue | 1 -
 app/views/shared/notes/_note.html.haml                    | 2 --
 spec/javascripts/notes/components/noteable_note_spec.js   | 1 -
 3 files changed, 4 deletions(-)

diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue
index 713f93456b1..9225a6b1a7c 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -170,7 +170,6 @@ export default {
             :author="author"
             :created-at="note.created_at"
             :note-id="note.id"
-            action-text="commented"
           />
           <note-actions
             :author-id="author.id"
diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml
index ca6e3602f05..526330f4e50 100644
--- a/app/views/shared/notes/_note.html.haml
+++ b/app/views/shared/notes/_note.html.haml
@@ -36,8 +36,6 @@
               = note.author.to_reference
           %span.note-headline-light
             %span.note-headline-meta
-              - unless note.system
-                commented
               - if note.system
                 %span.system-note-message
                   = markdown_field(note, :note)
diff --git a/spec/javascripts/notes/components/noteable_note_spec.js b/spec/javascripts/notes/components/noteable_note_spec.js
index cfd037633e9..2ffdec7314d 100644
--- a/spec/javascripts/notes/components/noteable_note_spec.js
+++ b/spec/javascripts/notes/components/noteable_note_spec.js
@@ -32,7 +32,6 @@ describe('issue_note', () => {
 
   it('should render note header content', () => {
     expect(vm.$el.querySelector('.note-header .note-header-author-name').textContent.trim()).toEqual(note.author.name);
-    expect(vm.$el.querySelector('.note-header .note-headline-meta').textContent.trim()).toContain('commented');
   });
 
   it('should render note actions', () => {
-- 
cgit v1.2.1


From 9214e273a8759cbcd21ea1ef62fd9d594cec1e1d Mon Sep 17 00:00:00 2001
From: Jasper Maes <jaspermaes.jm@gmail.com>
Date: Tue, 19 Jun 2018 18:33:18 +0200
Subject: Rails5 fix expected: 1 time with arguments: (97, anything,
 {"squash"=>false}) received: 0 times

---
 changelogs/unreleased/rails5-fix-48104.yml                  | 6 ++++++
 spec/controllers/projects/merge_requests_controller_spec.rb | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/rails5-fix-48104.yml

diff --git a/changelogs/unreleased/rails5-fix-48104.yml b/changelogs/unreleased/rails5-fix-48104.yml
new file mode 100644
index 00000000000..6cf519ad791
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-48104.yml
@@ -0,0 +1,6 @@
+---
+title: 'Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false})
+  received: 0 times'
+merge_request: 20004
+author: Jasper Maes
+type: fixed
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index a412e74581d..7f5f0b76c51 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -337,7 +337,12 @@ describe Projects::MergeRequestsController do
 
     context 'when the sha parameter matches the source SHA' do
       def merge_with_sha(params = {})
-        post :merge, base_params.merge(sha: merge_request.diff_head_sha).merge(params)
+        post_params = base_params.merge(sha: merge_request.diff_head_sha).merge(params)
+        if Gitlab.rails5?
+          post :merge, params: post_params, as: :json
+        else
+          post :merge, post_params
+        end
       end
 
       it 'returns :success' do
-- 
cgit v1.2.1


From 74bb2e728b8daab4073d15370ecee32ed8458a02 Mon Sep 17 00:00:00 2001
From: Jasper Maes <jaspermaes.jm@gmail.com>
Date: Tue, 19 Jun 2018 22:47:58 +0200
Subject: Rails5 fix Projects::PagesController spec

---
 changelogs/unreleased/rails5-fix-pages-controller.yml | 5 +++++
 spec/controllers/projects/pages_controller_spec.rb    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/rails5-fix-pages-controller.yml

diff --git a/changelogs/unreleased/rails5-fix-pages-controller.yml b/changelogs/unreleased/rails5-fix-pages-controller.yml
new file mode 100644
index 00000000000..eeb3747c4eb
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-pages-controller.yml
@@ -0,0 +1,5 @@
+---
+title: Rails5 fix Projects::PagesController spec
+merge_request: 20007
+author: Jasper Maes
+type: fixed
diff --git a/spec/controllers/projects/pages_controller_spec.rb b/spec/controllers/projects/pages_controller_spec.rb
index 11f54eef531..8d2fa6a1740 100644
--- a/spec/controllers/projects/pages_controller_spec.rb
+++ b/spec/controllers/projects/pages_controller_spec.rb
@@ -71,7 +71,7 @@ describe Projects::PagesController do
       {
         namespace_id: project.namespace,
         project_id: project,
-        project: { pages_https_only: false }
+        project: { pages_https_only: 'false' }
       }
     end
 
@@ -96,7 +96,7 @@ describe Projects::PagesController do
     it 'calls the update service' do
       expect(Projects::UpdateService)
         .to receive(:new)
-        .with(project, user, request_params[:project])
+        .with(project, user, ActionController::Parameters.new(request_params[:project]).permit!)
         .and_return(update_service)
 
       patch :update, request_params
-- 
cgit v1.2.1


From 3e3f527991eb53e91a618d6fa806b93617bbc68d Mon Sep 17 00:00:00 2001
From: Clement Ho <clemmakesapps@gmail.com>
Date: Tue, 19 Jun 2018 21:22:31 +0000
Subject: Resolve "Branch name status color is not correct anymore"

---
 app/assets/javascripts/create_merge_request_dropdown.js | 8 ++++----
 app/assets/stylesheets/framework/forms.scss             | 4 ++++
 app/views/projects/issues/_new_branch.html.haml         | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/create_merge_request_dropdown.js b/app/assets/javascripts/create_merge_request_dropdown.js
index 108082799ef..f77a5730b77 100644
--- a/app/assets/javascripts/create_merge_request_dropdown.js
+++ b/app/assets/javascripts/create_merge_request_dropdown.js
@@ -366,7 +366,7 @@ export default class CreateMergeRequestDropdown {
   removeMessage(target) {
     const { input, message } = this.getTargetData(target);
     const inputClasses = ['gl-field-error-outline', 'gl-field-success-outline'];
-    const messageClasses = ['gl-field-hint', 'gl-field-error-message', 'gl-field-success-message'];
+    const messageClasses = ['text-muted', 'text-danger', 'text-success'];
 
     inputClasses.forEach(cssClass => input.classList.remove(cssClass));
     messageClasses.forEach(cssClass => message.classList.remove(cssClass));
@@ -393,7 +393,7 @@ export default class CreateMergeRequestDropdown {
 
     this.removeMessage(target);
     input.classList.add('gl-field-success-outline');
-    message.classList.add('gl-field-success-message');
+    message.classList.add('text-success');
     message.textContent = sprintf(__('%{text} is available'), { text });
     message.style.display = 'inline-block';
   }
@@ -403,7 +403,7 @@ export default class CreateMergeRequestDropdown {
     const text = target === 'branch' ? __('branch name') : __('source');
 
     this.removeMessage(target);
-    message.classList.add('gl-field-hint');
+    message.classList.add('text-muted');
     message.textContent = sprintf(__('Checking %{text} availability…'), { text });
     message.style.display = 'inline-block';
   }
@@ -415,7 +415,7 @@ export default class CreateMergeRequestDropdown {
 
     this.removeMessage(target);
     input.classList.add('gl-field-error-outline');
-    message.classList.add('gl-field-error-message');
+    message.classList.add('text-danger');
     message.textContent = text;
     message.style.display = 'inline-block';
   }
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index 03520f42997..2b2e6d69e33 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -201,6 +201,10 @@ label {
 }
 
 .gl-show-field-errors {
+  .form-control {
+    height: 34px;
+  }
+
   .gl-field-success-outline {
     border: 1px solid $green-600;
 
diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml
index acb1a446ec4..a678cb6f058 100644
--- a/app/views/projects/issues/_new_branch.html.haml
+++ b/app/views/projects/issues/_new_branch.html.haml
@@ -40,7 +40,7 @@
               %label{ for: 'new-branch-name' }
                 = _('Branch name')
               %input#new-branch-name.js-branch-name.form-control{ type: 'text', placeholder: "#{@issue.to_branch_name}", value: "#{@issue.to_branch_name}" }
-              %span.js-branch-message.form-text.text-muted
+              %span.js-branch-message.form-text
 
             .form-group
               %label{ for: 'source-name' }
-- 
cgit v1.2.1


From 76e8b82d9d59e940e733a811ef2875fcd7835760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20H=C3=BCttemann?= <admin@herh.de>
Date: Wed, 20 Jun 2018 02:41:52 +0000
Subject: Correct cURL syntax

---
 doc/api/pages_domains.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/api/pages_domains.md b/doc/api/pages_domains.md
index 20275b902c6..da2ffcfe40a 100644
--- a/doc/api/pages_domains.md
+++ b/doc/api/pages_domains.md
@@ -122,11 +122,11 @@ POST /projects/:id/pages/domains
 | `key`         | file/string    | no       | The certificate key in PEM format.       |
 
 ```bash
-curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form="domain=ssl.domain.example" --form="certificate=@/path/to/cert.pem" --form="key=@/path/to/key.pem" https://gitlab.example.com/api/v4/projects/5/pages/domains
+curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form "domain=ssl.domain.example" --form "certificate=@/path/to/cert.pem" --form "key=@/path/to/key.pem" https://gitlab.example.com/api/v4/projects/5/pages/domains
 ```
 
 ```bash
-curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form="domain=ssl.domain.example" --form="certificate=$CERT_PEM" --form="key=$KEY_PEM" https://gitlab.example.com/api/v4/projects/5/pages/domains
+curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form "domain=ssl.domain.example" --form "certificate=$CERT_PEM" --form "key=$KEY_PEM" https://gitlab.example.com/api/v4/projects/5/pages/domains
 ```
 
 ```json
@@ -158,11 +158,11 @@ PUT /projects/:id/pages/domains/:domain
 | `key`         | file/string    | no       | The certificate key in PEM format.       |
 
 ```bash
-curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form="certificate=@/path/to/cert.pem" --form="key=@/path/to/key.pem" https://gitlab.example.com/api/v4/projects/5/pages/domains/ssl.domain.example
+curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form "certificate=@/path/to/cert.pem" --form "key=@/path/to/key.pem" https://gitlab.example.com/api/v4/projects/5/pages/domains/ssl.domain.example
 ```
 
 ```bash
-curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form="certificate=$CERT_PEM" --form="key=$KEY_PEM" https://gitlab.example.com/api/v4/projects/5/pages/domains/ssl.domain.example
+curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form "certificate=$CERT_PEM" --form "key=$KEY_PEM" https://gitlab.example.com/api/v4/projects/5/pages/domains/ssl.domain.example
 ```
 
 ```json
-- 
cgit v1.2.1


From 59154779d81c6359428af5f5cbdedbbd7ed32d5c Mon Sep 17 00:00:00 2001
From: Hiroyuki Sato <sathiroyuki@gmail.com>
Date: Wed, 20 Jun 2018 12:34:58 +0900
Subject: The json keys of ref switcher should not be translated

---
 app/controllers/projects_controller.rb               |  4 ++--
 changelogs/unreleased/48100-fix-branch-not-shown.yml |  6 ++++++
 spec/controllers/projects_controller_spec.rb         | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/48100-fix-branch-not-shown.yml

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a93b116c6fe..efb30ba4715 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -247,13 +247,13 @@ class ProjectsController < Projects::ApplicationController
 
     if find_branches
       branches = BranchesFinder.new(@repository, params).execute.take(100).map(&:name)
-      options[s_('RefSwitcher|Branches')] = branches
+      options['Branches'] = branches
     end
 
     if find_tags && @repository.tag_count.nonzero?
       tags = TagsFinder.new(@repository, params).execute.take(100).map(&:name)
 
-      options[s_('RefSwitcher|Tags')] = tags
+      options['Tags'] = tags
     end
 
     # If reference is commit id - we should add it to branch/tag selectbox
diff --git a/changelogs/unreleased/48100-fix-branch-not-shown.yml b/changelogs/unreleased/48100-fix-branch-not-shown.yml
new file mode 100644
index 00000000000..917c5c23f67
--- /dev/null
+++ b/changelogs/unreleased/48100-fix-branch-not-shown.yml
@@ -0,0 +1,6 @@
+---
+title: Fix branches are not shown in Merge Request dropdown when preferred language
+  is not English
+merge_request: 20016
+author: Hiroyuki Sato
+type: fixed
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 705b30f0130..90e698925b6 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -597,6 +597,22 @@ describe ProjectsController do
       expect(parsed_body["Tags"]).to include("v1.0.0")
       expect(parsed_body["Commits"]).to include("123456")
     end
+
+    context "when preferred language is Japanese" do
+      before do
+        user.update!(preferred_language: 'ja')
+        sign_in(user)
+      end
+
+      it "gets a list of branches, tags and commits" do
+        get :refs, namespace_id: public_project.namespace, id: public_project, ref: "123456"
+
+        parsed_body = JSON.parse(response.body)
+        expect(parsed_body["Branches"]).to include("master")
+        expect(parsed_body["Tags"]).to include("v1.0.0")
+        expect(parsed_body["Commits"]).to include("123456")
+      end
+    end
   end
 
   describe 'POST #preview_markdown' do
-- 
cgit v1.2.1


From e3046dcabe6d87eefd37ba124d42bcb721ec0a6c Mon Sep 17 00:00:00 2001
From: Jasper Maes <jaspermaes.jm@gmail.com>
Date: Wed, 20 Jun 2018 08:25:29 +0200
Subject: Rails5 fix Admin::HooksController

---
 app/controllers/admin/hooks_controller.rb  | 2 +-
 changelogs/unreleased/rails5-fix-48142.yml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/rails5-fix-48142.yml

diff --git a/app/controllers/admin/hooks_controller.rb b/app/controllers/admin/hooks_controller.rb
index 2b47819303e..fb788c47ef1 100644
--- a/app/controllers/admin/hooks_controller.rb
+++ b/app/controllers/admin/hooks_controller.rb
@@ -9,7 +9,7 @@ class Admin::HooksController < Admin::ApplicationController
   end
 
   def create
-    @hook = SystemHook.new(hook_params)
+    @hook = SystemHook.new(hook_params.to_h)
 
     if @hook.save
       redirect_to admin_hooks_path, notice: 'Hook was successfully created.'
diff --git a/changelogs/unreleased/rails5-fix-48142.yml b/changelogs/unreleased/rails5-fix-48142.yml
new file mode 100644
index 00000000000..bfd95cfbe8b
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-48142.yml
@@ -0,0 +1,5 @@
+---
+title: Rails5 fix Admin::HooksController
+merge_request: 20017
+author: Jasper Maes
+type: fixed
-- 
cgit v1.2.1


From 3df04bd17fe3823dfd178edfce2e4bc1e3c48e24 Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <cokoghenun@gitlab.com>
Date: Wed, 20 Jun 2018 07:36:50 +0000
Subject: Updated horizontal ellipsis icon for text-expander

---
 .../javascripts/vue_shared/components/expand_button.vue     | 13 ++++++++++++-
 app/assets/stylesheets/pages/commits.scss                   | 10 +++++++---
 app/views/projects/commits/_commit.html.haml                |  3 ++-
 app/views/projects/pipelines/_info.html.haml                |  2 +-
 changelogs/unreleased/text-expander-icon-update.yml         |  5 +++++
 .../javascripts/vue_shared/components/expand_button_spec.js |  2 +-
 6 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 changelogs/unreleased/text-expander-icon-update.yml

diff --git a/app/assets/javascripts/vue_shared/components/expand_button.vue b/app/assets/javascripts/vue_shared/components/expand_button.vue
index 0fdea651130..e6e92594b65 100644
--- a/app/assets/javascripts/vue_shared/components/expand_button.vue
+++ b/app/assets/javascripts/vue_shared/components/expand_button.vue
@@ -1,5 +1,7 @@
 <script>
 import { __ } from '~/locale';
+import Icon from '~/vue_shared/components/icon.vue';
+
 /**
  * Port of detail_behavior expand button.
  *
@@ -12,6 +14,9 @@ import { __ } from '~/locale';
  */
 export default {
   name: 'ExpandButton',
+  components: {
+    Icon,
+  },
   data() {
     return {
       isCollapsed: true,
@@ -22,6 +27,9 @@ export default {
       return __('Click to expand text');
     },
   },
+  destroyed() {
+    this.isCollapsed = true;
+  },
   methods: {
     onClick() {
       this.isCollapsed = !this.isCollapsed;
@@ -37,7 +45,10 @@ export default {
       type="button"
       class="text-expander btn-blank"
       @click="onClick">
-      ...
+      <icon
+        :size="12"
+        name="ellipsis_h"
+      />
     </button>
     <span v-if="!isCollapsed">
       <slot name="expanded"></slot>
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index dc8842212e0..49226ae8eac 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -135,10 +135,10 @@
 }
 
 .text-expander {
-  display: inline-block;
+  display: inline-flex;
   background: $white-light;
   color: $gl-text-color-secondary;
-  padding: 0 4px;
+  padding: 1px $gl-padding-4;
   cursor: pointer;
   border: 1px solid $border-gray-dark;
   border-radius: $border-radius-default;
@@ -180,6 +180,11 @@
 .commit-content {
   padding-right: 10px;
   white-space: normal;
+
+  .commit-title {
+    display: flex;
+    align-items: center;
+  }
 }
 
 .commit-actions {
@@ -253,7 +258,6 @@
 .generic_commit_status {
   a,
   button {
-    color: $gl-text-color;
     vertical-align: baseline;
   }
 
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 12b27eb9b66..90e55fd0fb0 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -34,7 +34,8 @@
           .d-block.d-sm-none
             = render_commit_status(commit, ref: ref)
         - if commit.description?
-          %button.text-expander.d-none.d-sm-inline-block.js-toggle-button{ type: "button" } ...
+          %button.text-expander.js-toggle-button
+            = sprite_icon('ellipsis_h', size: 12)
 
         .commiter
           - commit_author_link = commit_author_link(commit, avatar: false, size: 24)
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml
index aa53fc3ea28..04131a90a57 100644
--- a/app/views/projects/pipelines/_info.html.haml
+++ b/app/views/projects/pipelines/_info.html.haml
@@ -29,7 +29,7 @@
       = link_to @commit.short_id, project_commit_path(@project, @pipeline.sha), class: "commit-sha js-details-short"
       = link_to("#", class: "js-details-expand d-none d-sm-none d-md-inline") do
         %span.text-expander
-          \...
+          = sprite_icon('ellipsis_h', size: 12)
       %span.js-details-content.hide
         = link_to @pipeline.sha, project_commit_path(@project, @pipeline.sha), class: "commit-sha commit-hash-full"
       = clipboard_button(text: @pipeline.sha, title: "Copy commit SHA to clipboard")
diff --git a/changelogs/unreleased/text-expander-icon-update.yml b/changelogs/unreleased/text-expander-icon-update.yml
new file mode 100644
index 00000000000..be9dc98728f
--- /dev/null
+++ b/changelogs/unreleased/text-expander-icon-update.yml
@@ -0,0 +1,5 @@
+---
+title: Updated the icon for expand buttons to ellipsis
+merge_request: 18793
+author: Constance Okoghenun
+type: changed
\ No newline at end of file
diff --git a/spec/javascripts/vue_shared/components/expand_button_spec.js b/spec/javascripts/vue_shared/components/expand_button_spec.js
index af9693c48fd..98fee9a74a5 100644
--- a/spec/javascripts/vue_shared/components/expand_button_spec.js
+++ b/spec/javascripts/vue_shared/components/expand_button_spec.js
@@ -19,7 +19,7 @@ describe('expand button', () => {
   });
 
   it('renders a collpased button', () => {
-    expect(vm.$el.textContent.trim()).toEqual('...');
+    expect(vm.$children[0].iconTestClass).toEqual('ic-ellipsis_h');
   });
 
   it('hides expander on click', done => {
-- 
cgit v1.2.1


From ce30d14be5d9a403537a83dc005bee10e9825cea Mon Sep 17 00:00:00 2001
From: Jasper Maes <jaspermaes.jm@gmail.com>
Date: Wed, 20 Jun 2018 08:53:49 +0200
Subject: Rails5 fix  expected: 0 times with any arguments received: 1 time
 with arguments: DashboardController

---
 app/controllers/dashboard_controller.rb    | 2 +-
 changelogs/unreleased/rails5-fix-48141.yml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/rails5-fix-48141.yml

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 68d328fa797..ff133001b84 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -54,7 +54,7 @@ class DashboardController < Dashboard::ApplicationController
     return unless @no_filters_set
 
     respond_to do |format|
-      format.html
+      format.html { render }
       format.atom { head :bad_request }
     end
   end
diff --git a/changelogs/unreleased/rails5-fix-48141.yml b/changelogs/unreleased/rails5-fix-48141.yml
new file mode 100644
index 00000000000..5e2aa23b8fb
--- /dev/null
+++ b/changelogs/unreleased/rails5-fix-48141.yml
@@ -0,0 +1,6 @@
+---
+title: 'Rails5 fix  expected: 0 times with any arguments received: 1 time with arguments:
+  DashboardController'
+merge_request: 20018
+author: Jasper Maes
+type: fixed
-- 
cgit v1.2.1


From e9e9da822ac49cc857158c4ecc777b077a963280 Mon Sep 17 00:00:00 2001
From: "Jacob Vosmaer (GitLab)" <jacob@gitlab.com>
Date: Wed, 20 Jun 2018 09:33:50 +0000
Subject: More gitaly disk access blocks

---
 app/helpers/projects_helper.rb              | 1 +
 app/models/repository.rb                    | 5 ++++-
 config/initializers/1_settings.rb           | 1 +
 config/initializers/6_validations.rb        | 1 +
 lib/gitlab/health_checks/fs_shards_check.rb | 1 +
 lib/gitlab/setup_helper.rb                  | 1 +
 6 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index daad829faa2..c405e6d117f 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -407,6 +407,7 @@ module ProjectsHelper
     @ref || @repository.try(:root_ref)
   end
 
+  # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1235
   def sanitize_repo_path(project, message)
     return '' unless message.present?
 
diff --git a/app/models/repository.rb b/app/models/repository.rb
index e4202505634..c2f62badbcb 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -154,7 +154,10 @@ class Repository
 
   # Returns a list of commits that are not present in any reference
   def new_commits(newrev)
-    refs = ::Gitlab::Git::RevList.new(raw, newrev: newrev).new_refs
+    # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1233
+    refs = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
+      ::Gitlab::Git::RevList.new(raw, newrev: newrev).new_refs
+    end
 
     refs.map { |sha| commit(sha.strip) }
   end
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 12d09150127..3d3448cb4d6 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -394,6 +394,7 @@ repositories_storages          = Settings.repositories.storages.values
 repository_downloads_path      = Settings.gitlab['repository_downloads_path'].to_s.gsub(%r{/$}, '')
 repository_downloads_full_path = File.expand_path(repository_downloads_path, Settings.gitlab['user_home'])
 
+# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1237
 Gitlab::GitalyClient::StorageSettings.allow_disk_access do
   if repository_downloads_path.blank? || repositories_storages.any? { |rs| [repository_downloads_path, repository_downloads_full_path].include?(rs.legacy_disk_path.gsub(%r{/$}, '')) }
     Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive')
diff --git a/config/initializers/6_validations.rb b/config/initializers/6_validations.rb
index 362a23164ab..ff6865608f0 100644
--- a/config/initializers/6_validations.rb
+++ b/config/initializers/6_validations.rb
@@ -37,6 +37,7 @@ def validate_storages_config
   end
 end
 
+# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1237
 def validate_storages_paths
   Gitlab::GitalyClient::StorageSettings.allow_disk_access do
     Gitlab.config.repositories.storages.each do |name, repository_storage|
diff --git a/lib/gitlab/health_checks/fs_shards_check.rb b/lib/gitlab/health_checks/fs_shards_check.rb
index fcbf266b80b..050fe7a5173 100644
--- a/lib/gitlab/health_checks/fs_shards_check.rb
+++ b/lib/gitlab/health_checks/fs_shards_check.rb
@@ -1,5 +1,6 @@
 module Gitlab
   module HealthChecks
+    # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1218
     class FsShardsCheck
       extend BaseAbstractCheck
       RANDOM_STRING = SecureRandom.hex(1000).freeze
diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb
index 4a87f43597e..b2d75aac1d0 100644
--- a/lib/gitlab/setup_helper.rb
+++ b/lib/gitlab/setup_helper.rb
@@ -24,6 +24,7 @@ module Gitlab
             address = val['gitaly_address']
           end
 
+          # https://gitlab.com/gitlab-org/gitaly/issues/1238
           Gitlab::GitalyClient::StorageSettings.allow_disk_access do
             storages << { name: key, path: val.legacy_disk_path }
           end
-- 
cgit v1.2.1


From 9d7e73277ec65edfbcad269c1038ea0bb24e7427 Mon Sep 17 00:00:00 2001
From: Ahmad Hassan <ahmad.hassan612@gmail.com>
Date: Tue, 19 Jun 2018 16:26:39 +0200
Subject: Move backup custom hooks up a level

---
 lib/backup/repository.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 605a913cc6f..221ba52b490 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -55,6 +55,8 @@ module Backup
           backup_project_local(project)
         end
       end
+
+      backup_custom_hooks(project)
     rescue => e
       progress_warn(project, e, 'Failed to backup repo')
     end
@@ -63,8 +65,6 @@ module Backup
       path_to_project_bundle = path_to_bundle(project)
       Gitlab::GitalyClient::RepositoryService.new(project.repository)
         .create_bundle(path_to_project_bundle)
-
-      backup_custom_hooks(project)
     end
 
     def backup_project_local(project)
@@ -74,8 +74,6 @@ module Backup
 
       path_to_project_bundle = path_to_bundle(project)
 
-      backup_custom_hooks(project)
-
       cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{path_to_project_repo} bundle create #{path_to_project_bundle} --all)
       output, status = Gitlab::Popen.popen(cmd)
       progress_warn(project, cmd.join(' '), output) unless status.zero?
-- 
cgit v1.2.1


From 1273759ae908c11fe853ff039c5b10e9b1ce8451 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axil@gitlab.com>
Date: Wed, 20 Jun 2018 13:46:40 +0200
Subject: Add note about Master/Maintainer role

---
 doc/user/permissions.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index b36b0b4f757..a35bf48e62d 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -25,6 +25,9 @@ See our [product handbook on permissions](https://about.gitlab.com/handbook/prod
 
 ## Project members permissions
 
+NOTE: **Note:**
+In GitLab 11.0, the Master role was renamed to Maintainer.
+
 The following table depicts the various user permission levels in a project.
 
 | Action                                | Guest   | Reporter   | Developer   |Maintainer| Owner  |
@@ -146,6 +149,9 @@ read through the documentation on [permissions and access to confidential issues
 
 ## Group members permissions
 
+NOTE: **Note:**
+In GitLab 11.0, the Master role was renamed to Maintainer.
+
 Any user can remove themselves from a group, unless they are the last Owner of
 the group. The following table depicts the various user permission levels in a
 group.
@@ -223,6 +229,9 @@ which visibility level you select on project settings.
 
 ## GitLab CI/CD permissions
 
+NOTE: **Note:**
+In GitLab 11.0, the Master role was renamed to Maintainer.
+
 GitLab CI/CD permissions rely on the role the user has in GitLab. There are four
 permission levels in total:
 
@@ -250,6 +259,9 @@ instance and project. In addition, all admins can use the admin interface under
 
 ### Job permissions
 
+NOTE: **Note:**
+In GitLab 11.0, the Master role was renamed to Maintainer.
+
 >**Note:**
 GitLab 8.12 has a completely redesigned job permissions system.
 Read all about the [new model and its implications][new-mod].
@@ -301,4 +313,4 @@ Read through the documentation on [LDAP users permissions](https://docs.gitlab.c
 [ce-18994]: https://gitlab.com/gitlab-org/gitlab-ce/issues/18994
 [new-mod]: project/new_ci_build_permissions_model.md
 [ee-998]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/998
-[eep]: https://about.gitlab.com/products/
\ No newline at end of file
+[eep]: https://about.gitlab.com/products/
-- 
cgit v1.2.1