Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-22

# Conflicts:
#	.gitlab-ci.yml
#	db/migrate/20161007073613_create_user_activities.rb
#	db/post_migrate/20161128170531_drop_user_activities_table.rb

[ci skip]

.gitlab-ci.yml

@@ -798,10 +798,17 @@ gitlab:assets:compile:
       - webpack-report/
       - public/assets/
   only:
+<<<<<<< HEAD
     - branches@gitlab-org/gitlab-ce
     - branches@gitlab-org/gitlab-ee
     - tags@gitlab-org/gitlab-ce
     - tags@gitlab-org/gitlab-ee
+=======
+    - //@gitlab-org/gitlab-ce
+    - //@gitlab-org/gitlab-ee
+    - //@gitlab/gitabhq
+    - //@gitlab/gitlab-ee
+>>>>>>> upstream/master
   tags:
     - gitlab-org-delivery
     - high-cpu

app/assets/javascripts/diffs/components/app.vue

@@ -55,8 +55,6 @@ export default {
       diffViewType: state => state.diffs.diffViewType,
       mergeRequestDiffs: state => state.diffs.mergeRequestDiffs,
       mergeRequestDiff: state => state.diffs.mergeRequestDiff,
-      latestVersionPath: state => state.diffs.latestVersionPath,
-      startVersion: state => state.diffs.startVersion,
       commit: state => state.diffs.commit,
       targetBranchName: state => state.diffs.targetBranchName,
       renderOverflowWarning: state => state.diffs.renderOverflowWarning,
@@ -75,24 +73,6 @@ export default {
         path: '',
       };
     },
-    notAllCommentsDisplayed() {
-      if (this.commit) {
-        return __('Only comments from the following commit are shown below');
-      } else if (this.startVersion) {
-        return __(
-          "Not all comments are displayed because you're comparing two versions of the diff.",
-        );
-      }
-      return __(
-        "Not all comments are displayed because you're viewing an old version of the diff.",
-      );
-    },
-    showLatestVersion() {
-      if (this.commit) {
-        return __('Show latest version of the diff');
-      }
-      return __('Show latest version');
-    },
     canCurrentUserFork() {
       return this.currentUser.can_fork === true && this.currentUser.can_create_merge_request;
     },
@@ -184,10 +164,8 @@ export default {
     <div v-if="isLoading" class="loading"><gl-loading-icon /></div>
     <div v-else id="diffs" :class="{ active: shouldShow }" class="diffs tab-pane">
       <compare-versions
-        v-if="showCompareVersions"
         :merge-request-diffs="mergeRequestDiffs"
         :merge-request-diff="mergeRequestDiff"
-        :start-version="startVersion"
         :target-branch="targetBranch"
       />
 
@@ -199,35 +177,24 @@ export default {
         :email-patch-path="emailPatchPath"
       />
 
-      <div
-        v-if="commit || startVersion || (mergeRequestDiff && !mergeRequestDiff.latest)"
-        class="mr-version-controls"
-      >
-        <div class="content-block comments-disabled-notif clearfix">
-          <i class="fa fa-info-circle"></i> {{ notAllCommentsDisplayed }}
-          <div class="pull-right">
-            <a :href="latestVersionPath" class="btn btn-sm"> {{ showLatestVersion }} </a>
-          </div>
-        </div>
-      </div>
-
-      <commit-widget v-if="commit" :commit="commit" />
-
       <div
         :data-can-create-note="getNoteableData.current_user.can_create_note"
         class="files d-flex prepend-top-default"
       >
         <div v-show="showTreeList" class="diff-tree-list"><tree-list /></div>
-        <div v-if="diffFiles.length > 0" class="diff-files-holder">
+        <div class="diff-files-holder">
+          <commit-widget v-if="commit" :commit="commit" />
+          <template v-if="diffFiles.length > 0">
             <diff-file
               v-for="file in diffFiles"
               :key="file.newPath"
               :file="file"
               :can-current-user-fork="canCurrentUserFork"
             />
-        </div>
+          </template>
           <no-changes v-else />
         </div>
       </div>
     </div>
+  </div>
 </template>

app/assets/javascripts/diffs/components/commit_widget.vue

@@ -28,7 +28,7 @@ export default {
 </script>
 
 <template>
-  <div class="info-well prepend-top-default">
+  <div class="info-well w-100">
     <div class="well-segment">
       <ul class="blob-commit-info">
         <commit-item :commit="commit" />

app/assets/javascripts/diffs/components/compare_versions.vue

 <script>
 import { mapActions, mapGetters, mapState } from 'vuex';
-import { GlTooltipDirective } from '@gitlab/ui';
+import { GlTooltipDirective, GlLink, GlButton } from '@gitlab/ui';
 import { __ } from '~/locale';
 import { getParameterValues, mergeUrlParams } from '~/lib/utils/url_utility';
 import Icon from '~/vue_shared/components/icon.vue';
@@ -10,6 +10,8 @@ export default {
   components: {
     CompareVersionsDropdown,
     Icon,
+    GlLink,
+    GlButton,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -20,13 +22,9 @@ export default {
       required: true,
     },
     mergeRequestDiff: {
-      type: Object,
-      required: true,
-    },
-    startVersion: {
       type: Object,
       required: false,
-      default: null,
+      default: () => ({}),
     },
     targetBranch: {
       type: Object,
@@ -35,7 +33,7 @@ export default {
     },
   },
   computed: {
-    ...mapState('diffs', ['commit', 'showTreeList']),
+    ...mapState('diffs', ['commit', 'showTreeList', 'startVersion', 'latestVersionPath']),
     ...mapGetters('diffs', ['isInlineView', 'isParallelView', 'hasCollapsedFile']),
     comparableDiffs() {
       return this.mergeRequestDiffs.slice(1);
@@ -102,7 +100,18 @@ export default {
           class="mr-version-compare-dropdown"
         />
       </div>
+      <div v-else-if="commit">
+        {{ __('Viewing commit') }}
+        <gl-link :href="commit.commit_url" class="monospace">{{ commit.short_id }}</gl-link>
+      </div>
       <div class="inline-parallel-buttons d-none d-md-flex ml-auto">
+        <gl-button
+          v-if="commit || startVersion"
+          :href="latestVersionPath"
+          class="append-right-8 js-latest-version"
+        >
+          {{ __('Show latest version') }}
+        </gl-button>
         <a v-show="hasCollapsedFile" class="btn btn-default append-right-8" @click="expandAllFiles">
           {{ __('Expand all') }}
         </a>

app/assets/javascripts/diffs/components/diff_file_header.vue

 <script>
 import _ from 'underscore';
 import { mapActions, mapGetters } from 'vuex';
+import { polyfillSticky } from '~/lib/utils/sticky';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import Icon from '~/vue_shared/components/icon.vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
@@ -116,6 +117,9 @@ export default {
       return `\`${this.diffFile.file_path}\``;
     },
   },
+  mounted() {
+    polyfillSticky(this.$refs.header);
+  },
   methods: {
     ...mapActions('diffs', ['toggleFileDiscussions']),
     handleToggleFile(e, checkTarget) {

app/assets/stylesheets/pages/diff.scss

@@ -6,6 +6,28 @@
   .file-title-flex-parent {
     cursor: pointer;
 
+    @media (min-width: map-get($grid-breakpoints, md)) {
+      position: -webkit-sticky;
+      position: sticky;
+      top: 92px;
+      z-index: 102;
+
+      &::before {
+        content: '';
+        position: absolute;
+        top: -1px;
+        left: -10px;
+        width: 10px;
+        height: calc(100% + 1px);
+        background: $white-light;
+        border-right: 1px solid $border-color;
+      }
+    }
+
+    .with-performance-bar & {
+      top: 127px;
+    }
+
     a:hover {
       text-decoration: none;
     }

app/assets/stylesheets/pages/issuable.scss

@@ -22,7 +22,6 @@
   .detail-page-header,
   .page-content-header,
   .commit-box,
-  .info-well,
   .commit-ci-menu,
   .files-changed-inner,
   .limited-header-width,

app/assets/stylesheets/pages/merge_requests.scss

@@ -717,6 +717,7 @@
   .mr-version-menus-container {
     display: flex;
     align-items: center;
+    flex-wrap: wrap;
     padding: 16px;
     z-index: 199;
     white-space: nowrap;

changelogs/unreleased/mr-file-tree-commit.yml

+---
+title: Show tree collapse button for merge request commit diffs
+merge_request:
+author:
+type: fixed

changelogs/unreleased/mr-sticky-headers.yml

+---
+title: Make diff file headers sticky
+merge_request:
+author:
+type: changed

db/migrate/20161007073613_create_user_activities.rb

+<<<<<<< HEAD
+=======
+class CreateUserActivities < ActiveRecord::Migration[4.2]
+  DOWNTIME = false
+>>>>>>> upstream/master
 
 class CreateUserActivities < ActiveRecord::Migration[4.2]
   # Set this constant to true if this migration requires downtime.

db/post_migrate/20161128170531_drop_user_activities_table.rb

+<<<<<<< HEAD
 # See http://doc.gitlab.com/ce/development/migration_style_guide.html
 # for more information on how to write migrations for GitLab.
+=======
+>>>>>>> upstream/master
 class DropUserActivitiesTable < ActiveRecord::Migration[4.2]
   include Gitlab::Database::MigrationHelpers
 

doc/install/kubernetes/gitlab_chart.md

@@ -112,8 +112,7 @@ If your SMTP server requires authentication make sure to read the section on pro
 your password in the [secrets documentation](https://gitlab.com/charts/gitlab/blob/master/doc/installation/secrets.md#smtp-password).
 You can disable authentication settings with `--set global.smtp.authentication=""`.
 
-If your Kubernetes cluster is on GKE, be aware that SMTP ports [25, 465, and 587
-are blocked](https://cloud.google.com/compute/docs/tutorials/sending-mail/#using_standard_email_ports).
+If your Kubernetes cluster is on GKE, be aware that SMTP port [25 is blocked](https://cloud.google.com/compute/docs/tutorials/sending-mail/#using_standard_email_ports).
 
 ### Deploying the Community Edition
 

locale/gitlab.pot

@@ -5570,12 +5570,6 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-msgid "Not all comments are displayed because you're comparing two versions of the diff."
-msgstr ""
-
-msgid "Not all comments are displayed because you're viewing an old version of the diff."
-msgstr ""
-
 msgid "Not allowed to merge"
 msgstr ""
 
@@ -5728,9 +5722,6 @@ msgstr ""
 msgid "Only admins"
 msgstr ""
 
-msgid "Only comments from the following commit are shown below"
-msgstr ""
-
 msgid "Only mirror protected branches"
 msgstr ""
 
@@ -7478,9 +7469,6 @@ msgstr ""
 msgid "Show latest version"
 msgstr ""
 
-msgid "Show latest version of the diff"
-msgstr ""
-
 msgid "Show parent pages"
 msgstr ""
 
@@ -9010,6 +8998,9 @@ msgstr ""
 msgid "View the documentation"
 msgstr ""
 
+msgid "Viewing commit"
+msgstr ""
+
 msgid "Visibility and access controls"
 msgstr ""
 

qa/qa/runtime/env.rb

@@ -105,6 +105,14 @@ module QA
         ENV['GITLAB_SANDBOX_NAME']
       end
 
+      def namespace_name
+        ENV['GITLAB_NAMESPACE_NAME']
+      end
+
+      def auto_devops_project_name
+        ENV['GITLAB_AUTO_DEVOPS_PROJECT_NAME']
+      end
+
       def gcloud_account_key
         ENV.fetch("GCLOUD_ACCOUNT_KEY")
       end

qa/qa/runtime/namespace.rb

@@ -8,7 +8,7 @@ module QA
       end
 
       def name
-        "qa-test-#{time.strftime('%Y-%m-%d-%H-%M-%S')}"
+        Runtime::Env.namespace_name || "qa-test-#{time.strftime('%Y-%m-%d-%H-%M-%S')}"
       end
 
       def path

qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb

@@ -16,7 +16,7 @@ module QA
             Page::Main::Login.act { sign_in_using_credentials }
 
             project = Resource::Project.fabricate! do |p|
-              p.name = 'project-with-autodevops'
+              p.name = Runtime::Env.auto_devops_project_name || 'project-with-autodevops'
               p.description = 'Project with Auto Devops'
             end
 

spec/features/issues/gfm_autocomplete_spec.rb

@@ -9,7 +9,6 @@ describe 'GFM autocomplete', :js do
   let(:project) { create(:project) }
   let(:label) { create(:label, project: project, title: 'special+') }
   let(:issue)   { create(:issue, project: project) }
-  let!(:project_snippet) { create(:project_snippet, project: project, title: 'code snippet') }
 
   before do
     project.add_maintainer(user)
@@ -334,14 +333,55 @@ describe 'GFM autocomplete', :js do
     end
   end
 
-  it 'shows project snippets' do
+  shared_examples 'autocomplete suggestions' do
+    it 'suggests objects correctly' do
       page.within '.timeline-content-form' do
-      find('#note-body').native.send_keys('$')
+        find('#note-body').native.send_keys(object.class.reference_prefix)
       end
 
       page.within '.atwho-container' do
-      expect(page).to have_content(project_snippet.title)
+        expect(page).to have_content(object.title)
+
+        find('ul li').click
+      end
+
+      expect(find('.new-note #note-body').value).to include(expected_body)
+    end
+  end
+
+  context 'issues' do
+    let(:object) { issue }
+    let(:expected_body) { object.to_reference }
+
+    it_behaves_like 'autocomplete suggestions'
+  end
+
+  context 'merge requests' do
+    let(:object) { create(:merge_request, source_project: project) }
+    let(:expected_body) { object.to_reference }
+
+    it_behaves_like 'autocomplete suggestions'
   end
+
+  context 'project snippets' do
+    let!(:object) { create(:project_snippet, project: project, title: 'code snippet') }
+    let(:expected_body) { object.to_reference }
+
+    it_behaves_like 'autocomplete suggestions'
+  end
+
+  context 'label' do
+    let!(:object) { label }
+    let(:expected_body) { object.title }
+
+    it_behaves_like 'autocomplete suggestions'
+  end
+
+  context 'milestone' do
+    let!(:object) { create(:milestone, project: project) }
+    let(:expected_body) { object.to_reference }
+
+    it_behaves_like 'autocomplete suggestions'
   end
 
   private

spec/features/merge_request/user_sees_versions_spec.rb

@@ -66,7 +66,6 @@ describe 'Merge request > User sees versions', :js do
 
     it 'shows comments that were last relevant at that version' do
       expect(page).to have_content '5 changed files'
-      expect(page).to have_content 'Not all comments are displayed'
 
       position = Gitlab::Diff::Position.new(
         old_path: ".gitmodules",
@@ -112,7 +111,6 @@ describe 'Merge request > User sees versions', :js do
       )
       expect(page).to have_content '4 changed files'
       expect(page).to have_content '15 additions 6 deletions'
-      expect(page).to have_content 'Not all comments are displayed'
 
       position = Gitlab::Diff::Position.new(
         old_path: ".gitmodules",

spec/javascripts/diffs/components/app_spec.js

@@ -3,7 +3,6 @@ import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper
 import { TEST_HOST } from 'spec/test_constants';
 import App from '~/diffs/components/app.vue';
 import createDiffsStore from '../create_diffs_store';
-import getDiffWithCommit from '../mock_data/diff_with_commit';
 
 describe('diffs/components/app', () => {
   const oldMrTabs = window.mrTabs;
@@ -40,43 +39,4 @@ describe('diffs/components/app', () => {
   it('does not show commit info', () => {
     expect(vm.$el).not.toContainElement('.blob-commit-info');
   });
-
-  it('shows comments message, with commit', done => {
-    vm.$store.state.diffs.commit = getDiffWithCommit().commit;
-
-    vm.$nextTick()
-      .then(() => {
-        expect(vm.$el).toContainText('Only comments from the following commit are shown below');
-        expect(vm.$el).toContainElement('.blob-commit-info');
-      })
-      .then(done)
-      .catch(done.fail);
-  });
-
-  it('shows comments message, with old mergeRequestDiff', done => {
-    vm.$store.state.diffs.mergeRequestDiff = { latest: false };
-    vm.$store.state.diffs.targetBranch = 'master';
-
-    vm.$nextTick()
-      .then(() => {
-        expect(vm.$el).toContainText(
-          "Not all comments are displayed because you're viewing an old version of the diff.",
-        );
-      })
-      .then(done)
-      .catch(done.fail);
-  });
-
-  it('shows comments message, with startVersion', done => {
-    vm.$store.state.diffs.startVersion = 'test';
-
-    vm.$nextTick()
-      .then(() => {
-        expect(vm.$el).toContainText(
-          "Not all comments are displayed because you're comparing two versions of the diff.",
-        );
-      })
-      .then(done)
-      .catch(done.fail);
-  });
 });

spec/javascripts/diffs/components/compare_versions_spec.js

@@ -3,6 +3,7 @@ import CompareVersionsComponent from '~/diffs/components/compare_versions.vue';
 import store from '~/mr_notes/stores';
 import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
 import diffsMockData from '../mock_data/merge_request_diffs';
+import getDiffWithCommit from '../mock_data/diff_with_commit';
 
 describe('CompareVersions', () => {
   let vm;
@@ -122,4 +123,24 @@ describe('CompareVersions', () => {
       expect(vm.isWhitespaceVisible()).toBe(true);
     });
   });
+
+  describe('commit', () => {
+    beforeEach(done => {
+      vm.$store.state.diffs.commit = getDiffWithCommit().commit;
+      vm.mergeRequestDiffs = [];
+
+      vm.$nextTick(done);
+    });
+
+    it('renders latest version button', () => {
+      expect(vm.$el.querySelector('.js-latest-version').textContent.trim()).toBe(
+        'Show latest version',
+      );
+    });
+
+    it('renders short commit ID', () => {
+      expect(vm.$el.textContent).toContain('Viewing commit');
+      expect(vm.$el.textContent).toContain(vm.commit.short_id);
+    });
+  });
 });