From b5399517687edbe854f3bb51a89c30c13a3f12b4 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 18 Jul 2017 21:40:35 +0900
Subject: Ini

---
 lib/api/api.rb             |  1 +
 lib/api/group_variables.rb | 95 ++++++++++++++++++++++++++++++++++++++++++++++
 lib/api/helpers.rb         |  4 ++
 3 files changed, 100 insertions(+)
 create mode 100644 lib/api/group_variables.rb

(limited to 'lib')

diff --git a/lib/api/api.rb b/lib/api/api.rb
index efcf0976a81..f6a310841e4 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -134,6 +134,7 @@ module API
     mount ::API::Triggers
     mount ::API::Users
     mount ::API::Variables
+    mount ::API::GroupVariables
     mount ::API::Version
 
     route :any, '*path' do
diff --git a/lib/api/group_variables.rb b/lib/api/group_variables.rb
new file mode 100644
index 00000000000..0dd418887e0
--- /dev/null
+++ b/lib/api/group_variables.rb
@@ -0,0 +1,95 @@
+module API
+  class GroupVariables < Grape::API
+    include PaginationParams
+
+    before { authenticate! }
+    before { authorize! :admin_build, user_group }
+
+    params do
+      requires :id, type: String, desc: 'The ID of a group'
+    end
+
+    resource :groups, requirements: { id: %r{[^/]+} } do
+      desc 'Get group-level variables' do
+        success Entities::Variable
+      end
+      params do
+        use :pagination
+      end
+      get ':id/variables' do
+        variables = user_group.variables
+        present paginate(variables), with: Entities::Variable
+      end
+
+      desc 'Get a specific variable from a group' do
+        success Entities::Variable
+      end
+      params do
+        requires :key, type: String, desc: 'The key of the variable'
+      end
+      get ':id/variables/:key' do
+        key = params[:key]
+        variable = user_group.variables.find_by(key: key)
+
+        return not_found!('GroupVariable') unless variable
+
+        present variable, with: Entities::Variable
+      end
+
+      desc 'Create a new variable in a group' do
+        success Entities::Variable
+      end
+      params do
+        requires :key, type: String, desc: 'The key of the variable'
+        requires :value, type: String, desc: 'The value of the variable'
+        optional :protected, type: String, desc: 'Whether the variable is protected'
+      end
+      post ':id/variables' do
+        variable_params = declared_params(include_missing: false)
+
+        variable = user_group.variables.create(variable_params)
+
+        if variable.valid?
+          present variable, with: Entities::Variable
+        else
+          render_validation_error!(variable)
+        end
+      end
+
+      desc 'Update an existing variable from a group' do
+        success Entities::Variable
+      end
+      params do
+        optional :key, type: String, desc: 'The key of the variable'
+        optional :value, type: String, desc: 'The value of the variable'
+        optional :protected, type: String, desc: 'Whether the variable is protected'
+      end
+      put ':id/variables/:key' do
+        variable = user_group.variables.find_by(key: params[:key])
+
+        return not_found!('GroupVariable') unless variable
+
+        variable_params = declared_params(include_missing: false).except(:key)
+
+        if variable.update(variable_params)
+          present variable, with: Entities::Variable
+        else
+          render_validation_error!(variable)
+        end
+      end
+
+      desc 'Delete an existing variable from a group' do
+        success Entities::Variable
+      end
+      params do
+        requires :key, type: String, desc: 'The key of the variable'
+      end
+      delete ':id/variables/:key' do
+        variable = user_group.variables.find_by(key: params[:key])
+        not_found!('GroupVariable') unless variable
+
+        variable.destroy
+      end
+    end
+  end
+end
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 0f4791841d2..56cd1f3df5a 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -29,6 +29,10 @@ module API
       @project ||= find_project!(params[:id])
     end
 
+    def user_group
+      @group ||= find_group!(params[:id])
+    end
+
     def available_labels
       @available_labels ||= LabelsFinder.new(current_user, project_id: user_project.id).execute
     end
-- 
cgit v1.2.1


From 29a8827752b884f5e4cad4ec78cf5b655aa5c769 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 28 Jul 2017 10:56:50 +0200
Subject: Improve deploy environment chatops slash command

We now match deployment actions better. If there is more than one
deployment action matched, we check if there is an action which name
equals to environment name, instead of raising an error about too many
actions defined.
---
 lib/gitlab/slash_commands/deploy.rb            | 33 +++++++++++++++-----------
 lib/gitlab/slash_commands/presenters/deploy.rb | 11 ++++-----
 2 files changed, 23 insertions(+), 21 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/slash_commands/deploy.rb b/lib/gitlab/slash_commands/deploy.rb
index e71eb15d604..93e00ab75a1 100644
--- a/lib/gitlab/slash_commands/deploy.rb
+++ b/lib/gitlab/slash_commands/deploy.rb
@@ -21,29 +21,34 @@ module Gitlab
         from = match[:from]
         to = match[:to]
 
-        actions = find_actions(from, to)
+        action = find_action(from, to)
 
-        if actions.none?
-          Gitlab::SlashCommands::Presenters::Deploy.new(nil).no_actions
-        elsif actions.one?
-          action = play!(from, to, actions.first)
-          Gitlab::SlashCommands::Presenters::Deploy.new(action).present(from, to)
+        if action.nil?
+          Gitlab::SlashCommands::Presenters::Deploy
+            .new(action).action_not_found
         else
-          Gitlab::SlashCommands::Presenters::Deploy.new(actions).too_many_actions
+          deployment = action.play(current_user)
+
+          Gitlab::SlashCommands::Presenters::Deploy
+            .new(deployment).present(from, to)
         end
       end
 
       private
 
-      def play!(from, to, action)
-        action.play(current_user)
-      end
-
-      def find_actions(from, to)
+      def find_action(from, to)
         environment = project.environments.find_by(name: from)
-        return [] unless environment
+        return unless environment
 
-        environment.actions_for(to).select(&:starts_environment?)
+        actions = environment.actions_for(to).select do |action|
+          action.starts_environment?
+        end
+
+        if actions.many?
+          actions.find { |action| action.name == to.to_s }
+        else
+          actions.first
+        end
       end
     end
   end
diff --git a/lib/gitlab/slash_commands/presenters/deploy.rb b/lib/gitlab/slash_commands/presenters/deploy.rb
index b8dc77bd37b..b72586394bc 100644
--- a/lib/gitlab/slash_commands/presenters/deploy.rb
+++ b/lib/gitlab/slash_commands/presenters/deploy.rb
@@ -3,17 +3,14 @@ module Gitlab
     module Presenters
       class Deploy < Presenters::Base
         def present(from, to)
-          message = "Deployment started from #{from} to #{to}. [Follow its progress](#{resource_url})."
+          message = "Deployment started from #{from} to #{to}. " \
+                    "[Follow its progress](#{resource_url})."
 
           in_channel_response(text: message)
         end
 
-        def no_actions
-          ephemeral_response(text: "No action found to be executed")
-        end
-
-        def too_many_actions
-          ephemeral_response(text: "Too many actions defined")
+        def action_not_found
+          ephemeral_response(text: "Couldn't find a deployment action.")
         end
       end
     end
-- 
cgit v1.2.1


From 07bcabb305f62e445c77ca8081b473adf21f56da Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 28 Jul 2017 12:16:07 +0200
Subject: Improve wording related to deploy chatops command

---
 lib/gitlab/slash_commands/presenters/deploy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/slash_commands/presenters/deploy.rb b/lib/gitlab/slash_commands/presenters/deploy.rb
index b72586394bc..ebae0f57f9b 100644
--- a/lib/gitlab/slash_commands/presenters/deploy.rb
+++ b/lib/gitlab/slash_commands/presenters/deploy.rb
@@ -10,7 +10,7 @@ module Gitlab
         end
 
         def action_not_found
-          ephemeral_response(text: "Couldn't find a deployment action.")
+          ephemeral_response(text: "Couldn't find a deployment manual action.")
         end
       end
     end
-- 
cgit v1.2.1


From 05f90b861fbc60cba1912e6a74cb7a4c126e6b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?=
 <kim.carlbacker@gmail.com>
Date: Wed, 19 Jul 2017 17:34:14 +0200
Subject: Migrate GitGarbageCollectWorker to Gitaly

---
 lib/gitlab/gitaly_client/repository_service.rb | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index f5d84ea8762..13e75b256a7 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -4,12 +4,28 @@ module Gitlab
       def initialize(repository)
         @repository = repository
         @gitaly_repo = repository.gitaly_repository
+        @storage = repository.storage
       end
 
       def exists?
         request = Gitaly::RepositoryExistsRequest.new(repository: @gitaly_repo)
 
-        GitalyClient.call(@repository.storage, :repository_service, :exists, request).exists
+        GitalyClient.call(@storage, :repository_service, :exists, request).exists
+      end
+
+      def garbage_collect(create_bitmap)
+        request = Gitaly::GarbageCollectRequest.new(repository: @gitaly_repo, create_bitmap: create_bitmap)
+        GitalyClient.call(@storage, :repository_service, :garbage_collect, request)
+      end
+
+      def repack_full(create_bitmap)
+        request = Gitaly::RepackFullRequest.new(repository: @gitaly_repo, create_bitmap: create_bitmap)
+        GitalyClient.call(@storage, :repository_service, :repack_full, request)
+      end
+
+      def repack_incremental
+        request = Gitaly::RepackIncrementalRequest.new(repository: @gitaly_repo)
+        GitalyClient.call(@storage, :repository_service, :repack_incremental, request)
       end
     end
   end
-- 
cgit v1.2.1


From a07fe9d7f8f922020472ed54b060430a6da3da69 Mon Sep 17 00:00:00 2001
From: Alex Ives <alex@ives.mn>
Date: Mon, 24 Jul 2017 22:11:22 -0500
Subject: Fixes #29385: Add /shrug and /tableflip commands

- Updated DSL to support substitution definitions
- Added substitution definition, inherits from command definition
- Added tabelflip and shrug substitutions to interpret service
- Added support for substitution definitions to the extractor for preview mode.
- Added substitution handling in the interpret service

Signed-off-by: Alex Ives <alex@ives.mn>
---
 lib/gitlab/quick_actions/dsl.rb                    | 29 ++++++++++++++++++----
 lib/gitlab/quick_actions/extractor.rb              | 22 ++++++++++++++++
 .../quick_actions/substitution_definition.rb       | 24 ++++++++++++++++++
 3 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 lib/gitlab/quick_actions/substitution_definition.rb

(limited to 'lib')

diff --git a/lib/gitlab/quick_actions/dsl.rb b/lib/gitlab/quick_actions/dsl.rb
index a4a97236ffc..536765305e1 100644
--- a/lib/gitlab/quick_actions/dsl.rb
+++ b/lib/gitlab/quick_actions/dsl.rb
@@ -105,9 +105,32 @@ module Gitlab
         #     # Awesome code block
         #   end
         def command(*command_names, &block)
+          define_command(CommandDefinition, *command_names, &block)
+        end
+
+        # Registers a new substitution which is recognizable from body of email or
+        # comment.
+        # It accepts aliases and takes a block with the formatted content.
+        #
+        # Example:
+        #
+        #   command :my_substitution, :alias_for_my_substitution do |text|
+        #     "#{text} MY AWESOME SUBSTITUTION"
+        #   end
+        def substitution(*substitution_names, &block)
+          define_command(SubstitutionDefinition, *substitution_names, &block)
+        end
+
+        def definition_by_name(name)
+          command_definitions_by_name[name.to_sym]
+        end
+
+        private
+
+        def define_command(klass, *command_names, &block)
           name, *aliases = command_names
 
-          definition = CommandDefinition.new(
+          definition = klass.new(
             name,
             aliases: aliases,
             description: @description,
@@ -130,10 +153,6 @@ module Gitlab
           @condition_block = nil
           @parse_params_block = nil
         end
-
-        def definition_by_name(name)
-          command_definitions_by_name[name.to_sym]
-        end
       end
     end
   end
diff --git a/lib/gitlab/quick_actions/extractor.rb b/lib/gitlab/quick_actions/extractor.rb
index 09576be7156..3ebfa3bd4b8 100644
--- a/lib/gitlab/quick_actions/extractor.rb
+++ b/lib/gitlab/quick_actions/extractor.rb
@@ -46,6 +46,8 @@ module Gitlab
           end
         end
 
+        content, commands = perform_substitutions(content, commands)
+
         [content.strip, commands]
       end
 
@@ -110,6 +112,26 @@ module Gitlab
         }mx
       end
 
+      def perform_substitutions(content, commands)
+        return unless content
+
+        substitution_definitions = self.command_definitions.select do |definition|
+          definition.is_a?(Gitlab::QuickActions::SubstitutionDefinition)
+        end
+
+        substitution_definitions.each do |substitution|
+          match_data = substitution.match(content)
+          if match_data
+            command = [substitution.name.to_s]
+            command << match_data[1] unless match_data[1].empty?
+            commands << command
+          end
+          content = substitution.perform_substitution(self, content)
+        end
+
+        [content, commands]
+      end
+
       def command_names(opts)
         command_definitions.flat_map do |command|
           next if command.noop?
diff --git a/lib/gitlab/quick_actions/substitution_definition.rb b/lib/gitlab/quick_actions/substitution_definition.rb
new file mode 100644
index 00000000000..032c49ed159
--- /dev/null
+++ b/lib/gitlab/quick_actions/substitution_definition.rb
@@ -0,0 +1,24 @@
+module Gitlab
+  module QuickActions
+    class SubstitutionDefinition < CommandDefinition
+      # noop?=>true means these won't get extracted or removed by Gitlab::QuickActions::Extractor#extract_commands
+      # QuickActions::InterpretService#perform_substitutions handles them separately
+      def noop?
+        true
+      end
+
+      def match(content)
+        content.match %r{^/#{all_names.join('|')} ?(.*)$}
+      end
+
+      def perform_substitution(context, content)
+        return unless content
+
+        all_names.each do |a_name|
+          content.gsub!(%r{/#{a_name} ?(.*)$}, execute_block(action_block, context, '\1'))
+        end
+        content
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From bab49fdf9f27c44e830c470b749c5bc0022a25f5 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Tue, 25 Jul 2017 16:51:37 -0700
Subject: Protect backups from stale cache for repo exists

---
 lib/backup/repository.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index a1685c77916..02ed1e49ef8 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -189,6 +189,7 @@ module Backup
     end
 
     def empty_repo?(project_or_wiki)
+      project_or_wiki.repository.expire_exists_cache # protect backups from stale cache
       project_or_wiki.repository.empty_repo?
     rescue => e
       progress.puts "Ignoring repository error and continuing backing up project: #{project_or_wiki.path_with_namespace} - #{e.message}".color(:orange)
-- 
cgit v1.2.1


From ebd2ed8f644ba4f0fcaff979d4de41f773b31fdd Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Mon, 31 Jul 2017 11:42:50 +0200
Subject: Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor

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

(limited to 'lib')

diff --git a/lib/gitlab/ldap/authentication.rb b/lib/gitlab/ldap/authentication.rb
index 4745311402c..ed1de73f8c6 100644
--- a/lib/gitlab/ldap/authentication.rb
+++ b/lib/gitlab/ldap/authentication.rb
@@ -42,7 +42,7 @@ module Gitlab
       end
 
       def adapter
-        OmniAuth::LDAP::Adaptor.new(config.options.symbolize_keys)
+        OmniAuth::LDAP::Adaptor.new(config.omniauth_options)
       end
 
       def config
-- 
cgit v1.2.1


From 7b18c424644f98f04e527dd0c5e10b1c23f5bae4 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 31 Jul 2017 17:19:25 +0200
Subject: Remove unused (?) code

---
 lib/gitlab/diff/file.rb | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb
index d2863a4da71..6d7de52cb80 100644
--- a/lib/gitlab/diff/file.rb
+++ b/lib/gitlab/diff/file.rb
@@ -79,13 +79,6 @@ module Gitlab
         @new_content_sha = refs&.head_sha
       end
 
-      def new_content_commit
-        return @new_content_commit if defined?(@new_content_commit)
-
-        sha = new_content_commit
-        @new_content_commit = repository.commit(sha) if sha
-      end
-
       def old_content_sha
         return if new_file?
         return @old_content_sha if defined?(@old_content_sha)
@@ -94,13 +87,6 @@ module Gitlab
         @old_content_sha = refs&.base_sha
       end
 
-      def old_content_commit
-        return @old_content_commit if defined?(@old_content_commit)
-
-        sha = old_content_sha
-        @old_content_commit = repository.commit(sha) if sha
-      end
-
       def new_blob
         return @new_blob if defined?(@new_blob)
 
@@ -123,10 +109,6 @@ module Gitlab
         new_content_sha || old_content_sha
       end
 
-      def content_commit
-        new_content_commit || old_content_commit
-      end
-
       def blob
         new_blob || old_blob
       end
-- 
cgit v1.2.1


From b5f11ee90ca1d119160c27e5377ce812edaf5848 Mon Sep 17 00:00:00 2001
From: Semen Romanov <sveratum@gmail.com>
Date: Tue, 1 Aug 2017 05:25:26 +0000
Subject: Invalid variable

---
 lib/support/init.d/gitlab | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index c5f93336346..2f2de083dc0 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -291,7 +291,7 @@ start_gitlab() {
   fi
 
   if [ "$gitlab_workhorse_status" = "0" ]; then
-    echo "The GitLab Workhorse is already running with pid $spid, not restarting"
+    echo "The GitLab Workhorse is already running with pid $hpid, not restarting"
   else
     # No need to remove a socket, gitlab-workhorse does this itself.
     # Because gitlab-workhorse has multiple executables we need to fix
@@ -313,7 +313,7 @@ start_gitlab() {
 
   if [ "$gitlab_pages_enabled" = true ]; then
     if [ "$gitlab_pages_status" = "0" ]; then
-      echo "The GitLab Pages is already running with pid $spid, not restarting"
+      echo "The GitLab Pages is already running with pid $gppid, not restarting"
     else
       $app_root/bin/daemon_with_pidfile $gitlab_pages_pid_path  \
           $gitlab_pages_dir/gitlab-pages $gitlab_pages_options \
@@ -421,7 +421,7 @@ print_status() {
   fi
   if [ "$gitlab_pages_enabled" = true ]; then
     if [ "$gitlab_pages_status" = "0" ]; then
-        echo "The GitLab Pages with pid $mpid is running."
+        echo "The GitLab Pages with pid $gppid is running."
     else
         printf "The GitLab Pages is \033[31mnot running\033[0m.\n"
     fi
-- 
cgit v1.2.1


From abb878326c5cac283fff19716149211658ce25d1 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <brodock@gmail.com>
Date: Thu, 20 Jul 2017 11:34:09 +0200
Subject: Rename many path_with_namespace -> full_path

---
 lib/api/runner.rb                              | 4 ++--
 lib/backup/repository.rb                       | 6 +++---
 lib/banzai/filter/abstract_reference_filter.rb | 4 ++--
 lib/banzai/filter/upload_link_filter.rb        | 2 +-
 lib/ci/api/builds.rb                           | 4 ++--
 lib/github/import.rb                           | 2 +-
 lib/gitlab/bitbucket_import/importer.rb        | 2 +-
 lib/gitlab/email/message/repository_push.rb    | 2 +-
 lib/gitlab/github_import/wiki_formatter.rb     | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/api/runner.rb b/lib/api/runner.rb
index 405d25ca3c1..88fc62d33df 100644
--- a/lib/api/runner.rb
+++ b/lib/api/runner.rb
@@ -90,7 +90,7 @@ module API
         if result.valid?
           if result.build
             Gitlab::Metrics.add_event(:build_found,
-                                      project: result.build.project.path_with_namespace)
+                                      project: result.build.project.full_path)
             present result.build, with: Entities::JobRequest::Response
           else
             Gitlab::Metrics.add_event(:build_not_found)
@@ -119,7 +119,7 @@ module API
         job.trace.set(params[:trace]) if params[:trace]
 
         Gitlab::Metrics.add_event(:update_build,
-                                  project: job.project.path_with_namespace)
+                                  project: job.project.full_path)
 
         case params[:state].to_s
         when 'success'
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 02ed1e49ef8..f8cb8f089e7 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -7,7 +7,7 @@ module Backup
       prepare
 
       Project.find_each(batch_size: 1000) do |project|
-        progress.print " * #{project.path_with_namespace} ... "
+        progress.print " * #{project.full_path} ... "
         path_to_project_repo = path_to_repo(project)
         path_to_project_bundle = path_to_bundle(project)
 
@@ -71,7 +71,7 @@ module Backup
       end
 
       Project.find_each(batch_size: 1000) do |project|
-        progress.print " * #{project.path_with_namespace} ... "
+        progress.print " * #{project.full_path} ... "
         path_to_project_repo = path_to_repo(project)
         path_to_project_bundle = path_to_bundle(project)
 
@@ -185,7 +185,7 @@ module Backup
 
     def progress_warn(project, cmd, output)
       progress.puts "[WARNING] Executing #{cmd}".color(:orange)
-      progress.puts "Ignoring error on #{project.path_with_namespace} - #{output}".color(:orange)
+      progress.puts "Ignoring error on #{project.full_path} - #{output}".color(:orange)
     end
 
     def empty_repo?(project_or_wiki)
diff --git a/lib/banzai/filter/abstract_reference_filter.rb b/lib/banzai/filter/abstract_reference_filter.rb
index 7a262dd025c..685b43605ae 100644
--- a/lib/banzai/filter/abstract_reference_filter.rb
+++ b/lib/banzai/filter/abstract_reference_filter.rb
@@ -259,7 +259,7 @@ module Banzai
 
             found = []
             projects.each do |project|
-              ref = project.path_with_namespace
+              ref = project.full_path
               get_or_set_cache(cache, ref) { project }
               found << ref
             end
@@ -277,7 +277,7 @@ module Banzai
       end
 
       def current_project_path
-        @current_project_path ||= project.path_with_namespace
+        @current_project_path ||= project.full_path
       end
 
       def current_project_namespace_path
diff --git a/lib/banzai/filter/upload_link_filter.rb b/lib/banzai/filter/upload_link_filter.rb
index 45bb66dc99f..09844931be5 100644
--- a/lib/banzai/filter/upload_link_filter.rb
+++ b/lib/banzai/filter/upload_link_filter.rb
@@ -28,7 +28,7 @@ module Banzai
       end
 
       def build_url(uri)
-        File.join(Gitlab.config.gitlab.url, project.path_with_namespace, uri)
+        File.join(Gitlab.config.gitlab.url, project.full_path, uri)
       end
 
       def project
diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb
index e2e91ce99cd..79058c02ce5 100644
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
@@ -29,7 +29,7 @@ module Ci
           if result.valid?
             if result.build
               Gitlab::Metrics.add_event(:build_found,
-                                        project: result.build.project.path_with_namespace)
+                                        project: result.build.project.full_path)
 
               present result.build, with: Entities::BuildDetails
             else
@@ -64,7 +64,7 @@ module Ci
           build.trace.set(params[:trace]) if params[:trace]
 
           Gitlab::Metrics.add_event(:update_build,
-                                    project: build.project.path_with_namespace)
+                                    project: build.project.full_path)
 
           case params[:state].to_s
           when 'success'
diff --git a/lib/github/import.rb b/lib/github/import.rb
index ff5d7db2705..cea4be5460b 100644
--- a/lib/github/import.rb
+++ b/lib/github/import.rb
@@ -93,7 +93,7 @@ module Github
 
     def fetch_wiki_repository
       wiki_url  = "https://#{options.fetch(:token)}@github.com/#{repo}.wiki.git"
-      wiki_path = "#{project.path_with_namespace}.wiki"
+      wiki_path = "#{project.full_path}.wiki"
 
       unless project.wiki.repository_exists?
         gitlab_shell.import_repository(project.repository_storage_path, wiki_path, wiki_url)
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index 5a6d9ae99a0..28bbf3b384e 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -61,7 +61,7 @@ module Gitlab
       def import_wiki
         return if project.wiki.repository_exists?
 
-        path_with_namespace = "#{project.path_with_namespace}.wiki"
+        path_with_namespace = "#{project.full_path}.wiki"
         import_url = project.import_url.sub(/\.git\z/, ".git/wiki")
         gitlab_shell.import_repository(project.repository_storage_path, path_with_namespace, import_url)
       rescue StandardError => e
diff --git a/lib/gitlab/email/message/repository_push.rb b/lib/gitlab/email/message/repository_push.rb
index dd1d9dcd555..cd9d3a6483f 100644
--- a/lib/gitlab/email/message/repository_push.rb
+++ b/lib/gitlab/email/message/repository_push.rb
@@ -117,7 +117,7 @@ module Gitlab
 
         def subject
           subject_text = '[Git]'
-          subject_text << "[#{project.path_with_namespace}]"
+          subject_text << "[#{project.full_path}]"
           subject_text << "[#{ref_name}]" if @action == :push
           subject_text << ' '
 
diff --git a/lib/gitlab/github_import/wiki_formatter.rb b/lib/gitlab/github_import/wiki_formatter.rb
index 6c592ff469c..30cff1ba804 100644
--- a/lib/gitlab/github_import/wiki_formatter.rb
+++ b/lib/gitlab/github_import/wiki_formatter.rb
@@ -8,7 +8,7 @@ module Gitlab
       end
 
       def path_with_namespace
-        "#{project.path_with_namespace}.wiki"
+        "#{project.full_path}.wiki"
       end
 
       def import_url
-- 
cgit v1.2.1


From c6dee99803da69af967ef6db2ad84b6fed9ea542 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <brodock@gmail.com>
Date: Fri, 21 Jul 2017 06:13:26 +0200
Subject: Rename path_with_namespace -> disk_path when dealing with the
 filesystem

---
 lib/backup/repository.rb                  | 4 ++--
 lib/gitlab/import_export/repo_restorer.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index f8cb8f089e7..8d56b74bfd6 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -142,11 +142,11 @@ module Backup
     end
 
     def path_to_bundle(project)
-      File.join(backup_repos_path, project.path_with_namespace + '.bundle')
+      File.join(backup_repos_path, project.disk_path + '.bundle')
     end
 
     def path_to_tars(project, dir = nil)
-      path = File.join(backup_repos_path, project.path_with_namespace)
+      path = File.join(backup_repos_path, project.disk_path)
 
       if dir
         File.join(path, "#{dir}.tar")
diff --git a/lib/gitlab/import_export/repo_restorer.rb b/lib/gitlab/import_export/repo_restorer.rb
index c824d3ea9fc..32ca2809b2f 100644
--- a/lib/gitlab/import_export/repo_restorer.rb
+++ b/lib/gitlab/import_export/repo_restorer.rb
@@ -13,7 +13,7 @@ module Gitlab
       def restore
         return true unless File.exist?(@path_to_bundle)
 
-        gitlab_shell.import_repository(@project.repository_storage_path, @project.path_with_namespace, @path_to_bundle)
+        gitlab_shell.import_repository(@project.repository_storage_path, @project.disk_path, @path_to_bundle)
       rescue => e
         @shared.error(e)
         false
-- 
cgit v1.2.1


From fb06a4d8fe7bb10c2784f323261cfde04718aec9 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <brodock@gmail.com>
Date: Sat, 22 Jul 2017 02:37:22 +0200
Subject: Rename more path_with_namespace -> full_path or disk_path

---
 lib/backup/repository.rb                   | 6 +++---
 lib/banzai/filter/relative_link_filter.rb  | 2 +-
 lib/gitlab/github_import/importer.rb       | 2 +-
 lib/gitlab/github_import/wiki_formatter.rb | 4 ++--
 lib/tasks/gitlab/check.rake                | 2 +-
 lib/tasks/gitlab/list_repos.rake           | 2 +-
 lib/tasks/gitlab/shell.rake                | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 8d56b74bfd6..05175d51963 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -42,7 +42,7 @@ module Backup
         path_to_wiki_bundle = path_to_bundle(wiki)
 
         if File.exist?(path_to_wiki_repo)
-          progress.print " * #{wiki.path_with_namespace} ... "
+          progress.print " * #{wiki.full_path} ... "
           if empty_repo?(wiki)
             progress.puts " [SKIPPED]".color(:cyan)
           else
@@ -104,7 +104,7 @@ module Backup
         path_to_wiki_bundle = path_to_bundle(wiki)
 
         if File.exist?(path_to_wiki_bundle)
-          progress.print " * #{wiki.path_with_namespace} ... "
+          progress.print " * #{wiki.full_path} ... "
 
           # If a wiki bundle exists, first remove the empty repo
           # that was initialized with ProjectWiki.new() and then
@@ -192,7 +192,7 @@ module Backup
       project_or_wiki.repository.expire_exists_cache # protect backups from stale cache
       project_or_wiki.repository.empty_repo?
     rescue => e
-      progress.puts "Ignoring repository error and continuing backing up project: #{project_or_wiki.path_with_namespace} - #{e.message}".color(:orange)
+      progress.puts "Ignoring repository error and continuing backing up project: #{project_or_wiki.full_path} - #{e.message}".color(:orange)
 
       false
     end
diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb
index c2fed57a0d8..758f15c8a67 100644
--- a/lib/banzai/filter/relative_link_filter.rb
+++ b/lib/banzai/filter/relative_link_filter.rb
@@ -51,7 +51,7 @@ module Banzai
 
         uri.path = [
           relative_url_root,
-          context[:project].path_with_namespace,
+          context[:project].full_path,
           uri_type(file_path),
           Addressable::URI.escape(ref),
           Addressable::URI.escape(file_path)
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index a8c0b47e786..266b1a6fece 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -254,7 +254,7 @@ module Gitlab
       def import_wiki
         unless project.wiki.repository_exists?
           wiki = WikiFormatter.new(project)
-          gitlab_shell.import_repository(project.repository_storage_path, wiki.path_with_namespace, wiki.import_url)
+          gitlab_shell.import_repository(project.repository_storage_path, wiki.disk_path, wiki.import_url)
         end
       rescue Gitlab::Shell::Error => e
         # GitHub error message when the wiki repo has not been created,
diff --git a/lib/gitlab/github_import/wiki_formatter.rb b/lib/gitlab/github_import/wiki_formatter.rb
index 30cff1ba804..0396122eeb9 100644
--- a/lib/gitlab/github_import/wiki_formatter.rb
+++ b/lib/gitlab/github_import/wiki_formatter.rb
@@ -7,8 +7,8 @@ module Gitlab
         @project = project
       end
 
-      def path_with_namespace
-        "#{project.full_path}.wiki"
+      def disk_path
+        "#{project.disk_path}.wiki"
       end
 
       def import_url
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 858f1cd7b34..dbb3b827b9a 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -527,7 +527,7 @@ namespace :gitlab do
         repo_dirs = user.authorized_projects.map do |p|
           File.join(
             p.repository_storage_path,
-            "#{p.path_with_namespace}.git"
+            "#{p.disk_path}.git"
           )
         end
 
diff --git a/lib/tasks/gitlab/list_repos.rake b/lib/tasks/gitlab/list_repos.rake
index ffcc76e5498..b732db9db6e 100644
--- a/lib/tasks/gitlab/list_repos.rake
+++ b/lib/tasks/gitlab/list_repos.rake
@@ -9,7 +9,7 @@ namespace :gitlab do
       scope = scope.where('id IN (?) OR namespace_id in (?)', project_ids, namespace_ids)
     end
     scope.find_each do |project|
-      base = File.join(project.repository_storage_path, project.path_with_namespace)
+      base = File.join(project.repository_storage_path, project.disk_path)
       puts base + '.git'
       puts base + '.wiki.git'
     end
diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake
index ee2cdcdea1b..42825f29e32 100644
--- a/lib/tasks/gitlab/shell.rake
+++ b/lib/tasks/gitlab/shell.rake
@@ -80,7 +80,7 @@ namespace :gitlab do
           print '-'
         else
           if Gitlab::Shell.new.add_repository(project.repository_storage_path,
-                                              project.path_with_namespace)
+                                              project.disk_path)
             print '.'
           else
             print 'F'
-- 
cgit v1.2.1


From 07b574b41cb0ff4518895ea4e6c719e453fdc4e3 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <brodock@gmail.com>
Date: Mon, 24 Jul 2017 01:41:58 +0200
Subject: Added some extra TODOs for the Legacy Storage refactor

---
 lib/gitlab/import_export/uploads_saver.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/gitlab/import_export/uploads_saver.rb b/lib/gitlab/import_export/uploads_saver.rb
index 62a2553675c..f9ae5079d7c 100644
--- a/lib/gitlab/import_export/uploads_saver.rb
+++ b/lib/gitlab/import_export/uploads_saver.rb
@@ -24,6 +24,7 @@ module Gitlab
       end
 
       def uploads_path
+        # TODO: decide what to do with uploads. We will use UUIDs here too?
         File.join(Rails.root.join('public/uploads'), @project.path_with_namespace)
       end
     end
-- 
cgit v1.2.1


From 597e619080c393daa765bf6e5de74f60121d1f0e Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <brodock@gmail.com>
Date: Tue, 1 Aug 2017 07:44:25 +0200
Subject: Rename ensure_dir_exist -> ensure_storage_path_exist

---
 lib/backup/repository.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 05175d51963..88821ae56e0 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -75,7 +75,7 @@ module Backup
         path_to_project_repo = path_to_repo(project)
         path_to_project_bundle = path_to_bundle(project)
 
-        project.ensure_dir_exist
+        project.ensure_storage_path_exist
 
         cmd = if File.exist?(path_to_project_bundle)
                 %W(#{Gitlab.config.git.bin_path} clone --bare #{path_to_project_bundle} #{path_to_project_repo})
-- 
cgit v1.2.1


From e99564568b2fefab8973ce571594aaa888cf8494 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 31 Jul 2017 15:17:14 +0200
Subject: CI fixes for gitaly-ruby

---
 lib/tasks/gitlab/gitaly.rake | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index 9df07ea8d83..680e76af471 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -19,7 +19,10 @@ namespace :gitlab do
 
       Dir.chdir(args.dir) do
         create_gitaly_configuration
-        Bundler.with_original_env { run_command!([command]) }
+        # In CI we run scripts/gitaly-test-build instead of this command
+        unless ENV['CI'].present?
+          Bundler.with_original_env { run_command!(%w[/usr/bin/env -u BUNDLE_GEMFILE] + [command]) }
+        end
       end
     end
 
@@ -30,7 +33,9 @@ namespace :gitlab do
       puts "# Gitaly storage configuration generated from #{Gitlab.config.source} on #{Time.current.to_s(:long)}"
       puts "# This is in TOML format suitable for use in Gitaly's config.toml file."
 
-      puts gitaly_configuration_toml
+      # Exclude gitaly-ruby configuration because that depends on the gitaly
+      # installation directory.
+      puts gitaly_configuration_toml(gitaly_ruby: false)
     end
 
     private
@@ -41,7 +46,7 @@ namespace :gitlab do
     # only generate a configuration for the most common and simplest case: when
     # we have exactly one Gitaly process and we are sure it is running locally
     # because it uses a Unix socket.
-    def gitaly_configuration_toml
+    def gitaly_configuration_toml(gitaly_ruby: true)
       storages = []
       address = nil
 
@@ -60,6 +65,7 @@ namespace :gitlab do
       end
       config = { socket_path: address.sub(%r{\Aunix:}, ''), storage: storages }
       config[:auth] = { token: 'secret' } if Rails.env.test?
+      config[:'gitaly-ruby'] = { dir: File.join(Dir.pwd, 'ruby') } if gitaly_ruby
       TOML.dump(config)
     end
 
-- 
cgit v1.2.1


From 67de82cf5fa5a6408621cbf955c730e2825d9c39 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 31 Jul 2017 15:23:05 +0200
Subject: Add option to use CommitLanguages RPC

---
 lib/gitlab/git/repository.rb               | 27 +++++++++++++++++++++++++++
 lib/gitlab/gitaly_client/commit_service.rb |  7 +++++++
 2 files changed, 34 insertions(+)

(limited to 'lib')

diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index a3bc79109f8..88529ba2c47 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -636,6 +636,33 @@ module Gitlab
         @attributes.attributes(path)
       end
 
+      def languages(ref = nil)
+        Gitlab::GitalyClient.migrate(:commit_languages) do |is_enabled|
+          if is_enabled
+            gitaly_commit_client.languages(ref)
+          else
+            ref ||= rugged.head.target_id
+            languages = Linguist::Repository.new(rugged, ref).languages
+            total = languages.map(&:last).sum
+
+            languages = languages.map do |language|
+              name, share = language
+              color = Linguist::Language[name].color || "##{Digest::SHA256.hexdigest(name)[0...6]}"
+              {
+                value: (share.to_f * 100 / total).round(2),
+                label: name,
+                color: color,
+                highlight: color
+              }
+            end
+
+            languages.sort do |x, y|
+              y[:value] <=> x[:value]
+            end
+          end
+        end
+      end
+
       def gitaly_repository
         Gitlab::GitalyClient::Util.repository(@storage, @relative_path)
       end
diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb
index c6e52b530b3..a834781b1f1 100644
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
@@ -118,6 +118,13 @@ module Gitlab
         consume_commits_response(response)
       end
 
+      def languages(ref = nil)
+        request = Gitaly::CommitLanguagesRequest.new(repository: @gitaly_repo, revision: ref || '')
+        response = GitalyClient.call(@repository.storage, :commit_service, :commit_languages, request)
+
+        response.languages.map { |l| { value: l.share.round(2), label: l.name, color: l.color, highlight: l.color } }
+      end
+
       private
 
       def commit_diff_request_params(commit, options = {})
-- 
cgit v1.2.1


From 4fa83bbe90ea1f3d2c2d0d75f50ca732e299651f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 1 Aug 2017 13:52:44 +0200
Subject: Always fetch branches before finding the merge base, otherwise we
 could find an outdated merge base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/gitlab/ee_compat_check.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index 85e6db0a689..72d7d4f84d1 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -181,8 +181,6 @@ module Gitlab
     end
 
     def find_merge_base_with_master(branch:)
-      return if merge_base_found?
-
       # Start with (Math.exp(3).to_i = 20) until (Math.exp(6).to_i = 403)
       # In total we go (20 + 54 + 148 + 403 = 625) commits deeper
       depth = 20
-- 
cgit v1.2.1


From 0c5fbaa72b8e4f032cf58758f8aa75925d57b06f Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 1 Aug 2017 21:17:46 +0900
Subject: Add 204. Remove duplicated method.

---
 lib/api/group_variables.rb | 1 +
 lib/api/helpers.rb         | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/api/group_variables.rb b/lib/api/group_variables.rb
index 0dd418887e0..f64da4ab77b 100644
--- a/lib/api/group_variables.rb
+++ b/lib/api/group_variables.rb
@@ -88,6 +88,7 @@ module API
         variable = user_group.variables.find_by(key: params[:key])
         not_found!('GroupVariable') unless variable
 
+        status 204
         variable.destroy
       end
     end
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index de58e9779a9..234825480f2 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -33,10 +33,6 @@ module API
       @project ||= find_project!(params[:id])
     end
 
-    def user_group
-      @group ||= find_group!(params[:id])
-    end
-
     def available_labels
       @available_labels ||= LabelsFinder.new(current_user, project_id: user_project.id).execute
     end
-- 
cgit v1.2.1