Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-16

# Conflicts:
#	app/views/layouts/nav/sidebar/_project.html.haml
#	locale/gitlab.pot

[ci skip]

app/assets/javascripts/registry/components/collapsible_container.vue

@@ -28,11 +28,6 @@
         isOpen: false,
       };
     },
-    computed: {
-      clipboardText() {
-        return `docker pull ${this.repo.location}`;
-      },
-    },
     methods: {
       ...mapActions([
         'fetchRepos',
@@ -84,7 +79,7 @@
 
       <clipboard-button
         v-if="repo.location"
-        :text="clipboardText"
+        :text="repo.location"
         :title="repo.location"
         css-class="btn-default btn-transparent btn-clipboard"
       />

app/assets/javascripts/registry/components/table_registry.vue

@@ -56,10 +56,6 @@
           .catch(() => this.showError(errorMessagesTypes.FETCH_REGISTRY));
       },
 
-      clipboardText(text) {
-        return `docker pull ${text}`;
-      },
-
       showError(message) {
         Flash(errorMessages[message]);
       },
@@ -89,7 +85,7 @@
             <clipboard-button
               v-if="item.location"
               :title="item.location"
-              :text="clipboardText(item.location)"
+              :text="item.location"
               css-class="btn-default btn-transparent btn-clipboard"
             />
           </td>

app/views/layouts/nav/sidebar/_project.html.haml

@@ -79,11 +79,14 @@
             = nav_link(path: 'graphs#charts') do
               = link_to charts_project_graph_path(@project, current_ref) do
                 = _('Charts')
+<<<<<<< HEAD
 
             - if @project.feature_available?(:file_locks)
               = nav_link(controller: [:path_locks]) do
                 = link_to project_path_locks_path(@project) do
                   #{ _('Locked Files') }
+=======
+>>>>>>> upstream/master
 
       - if project_nav_tab? :issues
         = nav_link(controller: @project.issues_enabled? ? [:issues, :labels, :milestones, :boards] : :issues) do
@@ -118,11 +121,14 @@
               = link_to project_labels_path(@project), title: 'Labels' do
                 %span
                   = _('Labels')
+<<<<<<< HEAD
 
             - if EE::Gitlab::ServiceDesk.enabled?(project: @project)
               = nav_link(controller: :issues, action: :service_desk ) do
                 = link_to service_desk_project_issues_path(@project), title: 'Service Desk' do
                   %span Service Desk
+=======
+>>>>>>> upstream/master
 
             = nav_link(controller: :milestones) do
               = link_to project_milestones_path(@project), title: 'Milestones' do
@@ -334,8 +340,11 @@
                   = link_to project_pages_path(@project), title: 'Pages' do
                     %span
                       = _('Pages')
+<<<<<<< HEAD
 
               = render 'projects/settings/ee/nav'
+=======
+>>>>>>> upstream/master
 
       - else
         = nav_link(controller: :project_members) do

changelogs/unreleased/registry-ux-improvements-remove-clipboard-prefix.yml

+---
+title: Remove docker pull prefix from registry clipboard feature
+merge_request: 18933
+author: Lars Greiss
+type: changed

changelogs/unreleased/zj-add-branch-mandatory.yml

+---
+title: Adding branches through the WebUI is handled by Gitaly
+merge_request:
+author:
+type: other

lib/gitlab/git/repository.rb

@@ -776,13 +776,9 @@ module Gitlab
       end
 
       def add_branch(branch_name, user:, target:)
-        gitaly_migrate(:operation_user_create_branch, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
-          if is_enabled
-            gitaly_add_branch(branch_name, user, target)
-          else
-            rugged_add_branch(branch_name, user, target)
-          end
-        end
+        gitaly_operation_client.user_create_branch(branch_name, user, target)
+      rescue GRPC::FailedPrecondition => ex
+        raise InvalidRef, ex
       end
 
       def add_tag(tag_name, user:, target:, message: nil)
@@ -2211,22 +2207,6 @@ module Gitlab
         end
       end
 
-      def gitaly_add_branch(branch_name, user, target)
-        gitaly_operation_client.user_create_branch(branch_name, user, target)
-      rescue GRPC::FailedPrecondition => ex
-        raise InvalidRef, ex
-      end
-
-      def rugged_add_branch(branch_name, user, target)
-        target_object = Ref.dereference_object(lookup(target))
-        raise InvalidRef.new("target not found: #{target}") unless target_object
-
-        OperationService.new(user, self).add_branch(branch_name, target_object.oid)
-        find_branch(branch_name)
-      rescue Rugged::ReferenceError => ex
-        raise InvalidRef, ex
-      end
-
       def rugged_cherry_pick(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:)
         OperationService.new(user, self).with_branch(
           branch_name,

locale/gitlab.pot

@@ -8,8 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2018-05-15 15:07+0200\n"
 "PO-Revision-Date: 2018-05-15 15:07+0200\n"
+=======
+"POT-Creation-Date: 2018-05-15 15:05+0200\n"
+"PO-Revision-Date: 2018-05-15 15:05+0200\n"
+>>>>>>> upstream/master
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -76,11 +81,14 @@ msgid_plural "%d unstaged changes"
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
 msgid "%d vulnerability"
 msgid_plural "%d vulnerabilities"
 msgstr[0] ""
 msgstr[1] ""
 
+=======
+>>>>>>> upstream/master
 msgid "%s additional commit has been omitted to prevent performance issues."
 msgid_plural "%s additional commits have been omitted to prevent performance issues."
 msgstr[0] ""
@@ -132,11 +140,14 @@ msgstr ""
 msgid "%{title} changes"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "%{type} detected %d vulnerability"
 msgid_plural "%{type} detected %d vulnerabilities"
 msgstr[0] ""
 msgstr[1] ""
 
+=======
+>>>>>>> upstream/master
 msgid "%{unstaged} unstaged and %{staged} staged changes"
 msgstr ""
 
@@ -381,6 +392,7 @@ msgstr ""
 msgid "An error occurred when toggling the notification subscription"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "An error occurred when updating the issue weight"
 msgstr ""
 
@@ -390,6 +402,8 @@ msgstr ""
 msgid "An error occurred while detecting host keys"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "An error occurred while dismissing the alert. Refresh the page and try again."
 msgstr ""
 
@@ -1599,7 +1613,11 @@ msgstr ""
 msgid "Configure limits for web and API requests."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Configure push and pull mirrors."
+=======
+msgid "Configure push mirrors."
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Configure storage path and circuit breaker settings."
@@ -1797,9 +1815,12 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Creating epic"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "Cron Timezone"
 msgstr ""
 
@@ -2102,12 +2123,15 @@ msgstr ""
 msgid "Edit files in the editor and commit changes here"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Elasticsearch"
 msgstr ""
 
 msgid "Elasticsearch intergration. Elasticsearch AWS IAM."
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "Email"
 msgstr ""
 
@@ -2153,9 +2177,12 @@ msgstr ""
 msgid "Enable the Performance Bar for a given group."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Enabled"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "Environments"
 msgstr ""
 
@@ -2820,6 +2847,7 @@ msgstr ""
 msgid "IDE|Review"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Identity provider single sign on URL"
 msgstr ""
 
@@ -2829,6 +2857,8 @@ msgstr ""
 msgid "If using GitHub, you’ll see pipeline statuses on GitHub for your commits and pull requests. %{more_info_link}"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "If you already have files you can push them using the %{link_to_cli} below."
 msgstr ""
 
@@ -3055,9 +3085,12 @@ msgstr ""
 msgid "Leave project"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "License"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "List"
 msgstr ""
 
@@ -3942,6 +3975,7 @@ msgstr ""
 msgid "ProjectLifecycle|Stage"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "ProjectSettings|Contact an admin to change this setting."
 msgstr ""
 
@@ -3966,6 +4000,8 @@ msgstr ""
 msgid "ProjectSettings|Users can only push commits to this repository that were committed with one of their own verified emails."
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "Projects"
 msgstr ""
 
@@ -5404,9 +5440,12 @@ msgstr ""
 msgid "Verified"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "View epics list"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "View file @ "
 msgstr ""
 

spec/models/repository_spec.rb

@@ -990,65 +990,25 @@ describe Repository do
 
     subject { repository.add_branch(user, branch_name, target) }
 
-    context 'with Gitaly enabled' do
-      it "calls Gitaly's OperationService" do
-        expect_any_instance_of(Gitlab::GitalyClient::OperationService)
-          .to receive(:user_create_branch).with(branch_name, user, target)
-          .and_return(nil)
-
-        subject
-      end
-
-      it 'creates_the_branch' do
-        expect(subject.name).to eq(branch_name)
-        expect(repository.find_branch(branch_name)).not_to be_nil
-      end
-
-      context 'with a non-existing target' do
-        let(:target) { 'fake-target' }
+    it "calls Gitaly's OperationService" do
+      expect_any_instance_of(Gitlab::GitalyClient::OperationService)
+        .to receive(:user_create_branch).with(branch_name, user, target)
+        .and_return(nil)
 
-        it "returns false and doesn't create the branch" do
-          expect(subject).to be(false)
-          expect(repository.find_branch(branch_name)).to be_nil
-        end
-      end
+      subject
     end
 
-    context 'with Gitaly disabled', :disable_gitaly do
-      context 'when pre hooks were successful' do
-        it 'runs without errors' do
-          hook = double(trigger: [true, nil])
-          expect(Gitlab::Git::Hook).to receive(:new).exactly(3).times.and_return(hook)
-
-          expect { subject }.not_to raise_error
-        end
-
-        it 'creates the branch' do
-          allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([true, nil])
-
-          expect(subject.name).to eq(branch_name)
-        end
-
-        it 'calls the after_create_branch hook' do
-          expect(repository).to receive(:after_create_branch)
-
-          subject
-        end
-      end
-
-      context 'when pre hooks failed' do
-        it 'gets an error' do
-          allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([false, ''])
-
-          expect { subject }.to raise_error(Gitlab::Git::HooksService::PreReceiveError)
-        end
+    it 'creates_the_branch' do
+      expect(subject.name).to eq(branch_name)
+      expect(repository.find_branch(branch_name)).not_to be_nil
+    end
 
-        it 'does not create the branch' do
-          allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([false, ''])
+    context 'with a non-existing target' do
+      let(:target) { 'fake-target' }
 
-          expect { subject }.to raise_error(Gitlab::Git::HooksService::PreReceiveError)
-          expect(repository.find_branch(branch_name)).to be_nil
-        end
+      it "returns false and doesn't create the branch" do
+        expect(subject).to be(false)
+        expect(repository.find_branch(branch_name)).to be_nil
       end
     end
   end