Resolved conflicts with master

Gemfile

@@ -401,6 +401,7 @@ gem 'sys-filesystem', '~> 1.1.6'
 
 # SSH host key support
 gem 'net-ssh', '~> 4.1.0'
+gem 'sshkey', '~> 1.9.0'
 
 # Required for ED25519 SSH host key support
 group :ed25519 do

Gemfile.lock

@@ -895,6 +895,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
+    sshkey (1.9.0)
     stackprof (0.2.10)
     state_machines (0.4.0)
     state_machines-activemodel (0.4.0)
@@ -1192,6 +1193,7 @@ DEPENDENCIES
   spring-commands-rspec (~> 1.0.4)
   spring-commands-spinach (~> 1.1.0)
   sprockets (~> 3.7.0)
+  sshkey (~> 1.9.0)
   stackprof (~> 0.2.10)
   state_machines-activerecord (~> 0.4.0)
   sys-filesystem (~> 1.1.6)

app/assets/javascripts/dispatcher.js

@@ -43,175 +43,14 @@ var Dispatcher;
       });
 
       switch (page) {
-        case 'projects:environments:metrics':
-          import('./pages/projects/environments/metrics')
-            .then(callDefault)
-            .catch(fail);
-          break;
         case 'projects:merge_requests:index':
         case 'projects:issues:index':
         case 'projects:issues:show':
-          shortcut_handler = true;
-          break;
-        case 'projects:milestones:index':
-          import('./pages/projects/milestones/index')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects:milestones:show':
-          import('./pages/projects/milestones/show')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'groups:milestones:show':
-          import('./pages/groups/milestones/show')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'dashboard:milestones:show':
-          import('./pages/dashboard/milestones/show')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'dashboard:issues':
-          import('./pages/dashboard/issues')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'dashboard:merge_requests':
-          import('./pages/dashboard/merge_requests')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'groups:issues':
-          import('./pages/groups/issues')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'groups:merge_requests':
-          import('./pages/groups/merge_requests')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'dashboard:todos:index':
-          import('./pages/dashboard/todos/index')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'admin:jobs:index':
-          import('./pages/admin/jobs/index')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'admin:projects:index':
-          import('./pages/admin/projects/index/index')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'admin:users:index':
-          import('./pages/admin/users/shared')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'admin:users:show':
-          import('./pages/admin/users/shared')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'dashboard:projects:index':
-        case 'dashboard:projects:starred':
-          import('./pages/dashboard/projects')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'explore:projects:index':
-        case 'explore:projects:trending':
-        case 'explore:projects:starred':
-          import('./pages/explore/projects')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'explore:groups:index':
-          import('./pages/explore/groups')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects:milestones:new':
-        case 'projects:milestones:create':
-          import('./pages/projects/milestones/new')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects:milestones:edit':
-        case 'projects:milestones:update':
-          import('./pages/projects/milestones/edit')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'groups:milestones:new':
-        case 'groups:milestones:create':
-          import('./pages/groups/milestones/new')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'groups:milestones:edit':
-        case 'groups:milestones:update':
-          import('./pages/groups/milestones/edit')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects:compare:show':
-          import('./pages/projects/compare/show')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects:branches:new':
-          import('./pages/projects/branches/new')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects:branches:create':
-          import('./pages/projects/branches/new')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects:branches:index':
-          import('./pages/projects/branches/index')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects:boards:show':
-        case 'projects:boards:index':
-          import('./pages/projects/boards')
-            .then(callDefault)
-            .catch(fail);
-          break;
         case 'projects:issues:new':
-          import('./pages/projects/issues/new')
-            .then(callDefault)
-            .catch(fail);
-          shortcut_handler = true;
-          break;
         case 'projects:issues:edit':
-          import('./pages/projects/issues/edit')
-            .then(callDefault)
-            .catch(fail);
-          shortcut_handler = true;
-          break;
         case 'projects:merge_requests:creations:new':
-          import('./pages/projects/merge_requests/creations/new')
-            .then(callDefault)
-            .catch(fail);
         case 'projects:merge_requests:creations:diffs':
-          import('./pages/projects/merge_requests/creations/diffs')
-            .then(callDefault)
-            .catch(fail);
-          shortcut_handler = true;
-          break;
         case 'projects:merge_requests:edit':
-          import('./pages/projects/merge_requests/edit')
-            .then(callDefault)
-            .catch(fail);
           shortcut_handler = true;
           break;
         case 'projects:tags:new':

app/assets/javascripts/graphs/graphs_bundle.js

-import Chart from 'vendor/Chart';
-
-// export to global scope
-window.Chart = Chart;

app/assets/javascripts/ide/monaco_loader.js

@@ -6,6 +6,11 @@ monacoContext.require.config({
   },
 });
 
+// ignore CDN config and use local assets path for service worker which cannot be cross-domain
+const relativeRootPath = (gon && gon.relative_url_root) || '';
+const monacoPath = `${relativeRootPath}/assets/webpack/monaco-editor/vs`;
+window.MonacoEnvironment = { getWorkerUrl: () => `${monacoPath}/base/worker/workerMain.js` };
+
 // eslint-disable-next-line no-underscore-dangle
 window.__monaco_context__ = monacoContext;
 export default monacoContext.require;

app/assets/javascripts/pages/admin/jobs/index/index.js

 import Vue from 'vue';
-
 import Translate from '~/vue_shared/translate';
-
 import stopJobsModal from './components/stop_jobs_modal.vue';
 
 Vue.use(Translate);
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   const stopJobsButton = document.getElementById('stop-jobs-button');
   if (stopJobsButton) {
     // eslint-disable-next-line no-new
@@ -27,4 +25,4 @@ export default () => {
       },
     });
   }
-};
+});

app/assets/javascripts/pages/admin/projects/index/index.js

@@ -5,7 +5,7 @@ import csrf from '~/lib/utils/csrf';
 
 import deleteProjectModal from './components/delete_project_modal.vue';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   Vue.use(Translate);
 
   const deleteProjectModalEl = document.getElementById('delete-project-modal');
@@ -34,4 +34,4 @@ export default () => {
       deleteModal.projectName = buttonProps.projectName;
     }
   });
-};
+});

app/assets/javascripts/pages/admin/users/shared/index.js → app/assets/javascripts/pages/admin/users/index.js

@@ -5,7 +5,7 @@ import csrf from '~/lib/utils/csrf';
 
 import deleteUserModal from './components/delete_user_modal.vue';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   Vue.use(Translate);
 
   const deleteUserModalEl = document.getElementById('delete-user-modal');
@@ -40,4 +40,4 @@ export default () => {
       deleteModal.username = buttonProps.username;
     }
   });
-};
+});

app/assets/javascripts/pages/dashboard/issues/index.js

 import projectSelect from '~/project_select';
 import initLegacyFilters from '~/init_legacy_filters';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   projectSelect();
   initLegacyFilters();
-};
+});

app/assets/javascripts/pages/dashboard/merge_requests/index.js

 import projectSelect from '~/project_select';
 import initLegacyFilters from '~/init_legacy_filters';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   projectSelect();
   initLegacyFilters();
-};
+});

app/assets/javascripts/pages/dashboard/milestones/show/index.js

 import Milestone from '~/milestone';
 import Sidebar from '~/right_sidebar';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new Milestone(); // eslint-disable-line no-new
   new Sidebar(); // eslint-disable-line no-new
-};
+});

app/assets/javascripts/pages/dashboard/projects/index.js

 import ProjectsList from '~/projects_list';
 
-export default () => new ProjectsList();
+document.addEventListener('DOMContentLoaded', () => new ProjectsList());

app/assets/javascripts/pages/dashboard/todos/index/index.js

 import Todos from './todos';
 
-export default () => new Todos();
+document.addEventListener('DOMContentLoaded', () => new Todos());

app/assets/javascripts/pages/explore/groups/index.js

@@ -2,7 +2,7 @@ import GroupsList from '~/groups_list';
 import Landing from '~/landing';
 import initGroupsList from '../../../groups';
 
-export default function () {
+document.addEventListener('DOMContentLoaded', () => {
   new GroupsList(); // eslint-disable-line no-new
   initGroupsList();
   const landingElement = document.querySelector('.js-explore-groups-landing');
@@ -13,4 +13,4 @@ export default function () {
     'explore_groups_landing_dismissed',
   );
   exploreGroupsLanding.toggle();
-}
+});

app/assets/javascripts/pages/explore/projects/index.js

 import ProjectsList from '~/projects_list';
 
-export default () => new ProjectsList();
+document.addEventListener('DOMContentLoaded', () => new ProjectsList());

app/assets/javascripts/pages/groups/issues/index.js

@@ -2,9 +2,9 @@ import projectSelect from '~/project_select';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
 import { FILTERED_SEARCH } from '~/pages/constants';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   initFilteredSearch({
     page: FILTERED_SEARCH.ISSUES,
   });
   projectSelect();
-};
+});

app/assets/javascripts/pages/groups/merge_requests/index.js

@@ -2,9 +2,9 @@ import projectSelect from '~/project_select';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
 import { FILTERED_SEARCH } from '~/pages/constants';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   initFilteredSearch({
     page: FILTERED_SEARCH.MERGE_REQUESTS,
   });
   projectSelect();
-};
+});

app/assets/javascripts/pages/groups/milestones/edit/index.js

 import initForm from '../../../../shared/milestones/form';
 
-export default () => initForm(false);
+document.addEventListener('DOMContentLoaded', () => initForm(false));

app/assets/javascripts/pages/groups/milestones/new/index.js

 import initForm from '../../../../shared/milestones/form';
 
-export default () => initForm(false);
+document.addEventListener('DOMContentLoaded', () => initForm(false));

app/assets/javascripts/pages/groups/milestones/show/index.js

 import initMilestonesShow from '~/pages/milestones/shared/init_milestones_show';
 
-export default initMilestonesShow;
+document.addEventListener('DOMContentLoaded', initMilestonesShow);

app/assets/javascripts/pages/projects/boards/index.js

@@ -2,8 +2,8 @@ import UsersSelect from '~/users_select';
 import ShortcutsNavigation from '~/shortcuts_navigation';
 import initBoards from '~/boards';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new UsersSelect(); // eslint-disable-line no-new
   new ShortcutsNavigation(); // eslint-disable-line no-new
   initBoards();
-};
+});

app/assets/javascripts/pages/projects/branches/index/index.js

 import AjaxLoadingSpinner from '~/ajax_loading_spinner';
 import DeleteModal from '~/branches/branches_delete_modal';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   AjaxLoadingSpinner.init();
   new DeleteModal(); // eslint-disable-line no-new
-};
+});

app/assets/javascripts/pages/projects/branches/new/index.js

 import NewBranchForm from '~/new_branch_form';
 
-export default () => new NewBranchForm($('.js-create-branch-form'), JSON.parse(document.getElementById('availableRefs').innerHTML));
+document.addEventListener('DOMContentLoaded', () => (
+  new NewBranchForm($('.js-create-branch-form'), JSON.parse(document.getElementById('availableRefs').innerHTML))
+));

app/assets/javascripts/pages/projects/compare/show/index.js

 import Diff from '~/diff';
 import initChangesDropdown from '~/init_changes_dropdown';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new Diff(); // eslint-disable-line no-new
   const paddingTop = 16;
   initChangesDropdown(document.querySelector('.navbar-gitlab').offsetHeight - paddingTop);
-};
+});

app/assets/javascripts/pages/projects/environments/metrics/index.js

 import monitoringBundle from '~/monitoring/monitoring_bundle';
 
-export default monitoringBundle;
+document.addEventListener('DOMContentLoaded', monitoringBundle);

app/assets/javascripts/graphs/graphs_charts.js → app/assets/javascripts/pages/projects/graphs/charts/index.js

-import Chart from 'vendor/Chart';
+import Chart from 'chart.js';
 import _ from 'underscore';
 
 document.addEventListener('DOMContentLoaded', () => {

app/assets/javascripts/pages/projects/issues/edit/index.js

 import initForm from '../form';
 
-export default () => {
-  initForm();
-};
+document.addEventListener('DOMContentLoaded', initForm);

app/assets/javascripts/pages/projects/issues/new/index.js

 import initForm from '../form';
 
-export default () => {
-  initForm();
-};
+document.addEventListener('DOMContentLoaded', initForm);

app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js → app/assets/javascripts/pages/projects/merge_requests/creations/index.js

 import initMergeRequest from '~/pages/projects/merge_requests/init_merge_request';
 
-export default initMergeRequest;
+document.addEventListener('DOMContentLoaded', initMergeRequest);

app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js

 import Compare from '~/compare';
 import MergeRequest from '~/merge_request';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   const mrNewCompareNode = document.querySelector('.js-merge-request-new-compare');
   if (mrNewCompareNode) {
     new Compare({ // eslint-disable-line no-new
@@ -15,4 +15,4 @@ export default () => {
       action: mrNewSubmitNode.dataset.mrSubmitAction,
     });
   }
-};
+});

app/assets/javascripts/pages/projects/merge_requests/edit/index.js

 import initMergeRequest from '~/pages/projects/merge_requests/init_merge_request';
 
-export default initMergeRequest;
+document.addEventListener('DOMContentLoaded', initMergeRequest);

app/assets/javascripts/pages/projects/milestones/edit/index.js

 import initForm from '../../../../shared/milestones/form';
 
-export default () => initForm();
+document.addEventListener('DOMContentLoaded', () => initForm());

app/assets/javascripts/pages/projects/milestones/index/index.js

 import milestones from '~/pages/milestones/shared';
 
-export default milestones;
+document.addEventListener('DOMContentLoaded', milestones);

app/assets/javascripts/pages/projects/milestones/new/index.js

 import initForm from '../../../../shared/milestones/form';
 
-export default () => initForm();
+document.addEventListener('DOMContentLoaded', () => initForm());

app/assets/javascripts/pages/projects/milestones/show/index.js

 import initMilestonesShow from '~/pages/milestones/shared/init_milestones_show';
 import milestones from '~/pages/milestones/shared';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   initMilestonesShow();
   milestones();
-};
+});

app/assets/javascripts/pages/projects/pipelines/charts/index.js

-import Chart from 'vendor/Chart';
+import Chart from 'chart.js';
 
 const options = {
   scaleOverlay: true,

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue

@@ -44,7 +44,10 @@
         type="button"
         class="btn btn-xs btn-default"
       >
-        <loading-icon v-if="isRefreshing" />
+        <loading-icon
+          v-if="isRefreshing"
+          :inline="true"
+        />
         {{ s__("mrWidget|Refresh") }}
       </button>
     </div>

app/assets/stylesheets/framework/stacked_progress_bar.scss

@@ -10,7 +10,7 @@
   .status-neutral,
   .status-red, {
     height: 100%;
-    min-width: 25px;
+    min-width: 30px;
     padding: 0 5px;
     font-size: $tooltip-font-size;
     font-weight: normal;

app/helpers/webpack_helper.rb

@@ -7,17 +7,24 @@ module WebpackHelper
 
   def webpack_controller_bundle_tags
     bundles = []
-    segments = [*controller.controller_path.split('/'), controller.action_name].compact
 
-    until segments.empty?
+    action = case controller.action_name
+             when 'create' then 'new'
+             when 'update' then 'edit'
+             else controller.action_name
+             end
+
+    route = [*controller.controller_path.split('/'), action].compact
+
+    until route.empty?
       begin
-        asset_paths = gitlab_webpack_asset_paths("pages.#{segments.join('.')}", extension: 'js')
+        asset_paths = gitlab_webpack_asset_paths("pages.#{route.join('.')}", extension: 'js')
         bundles.unshift(*asset_paths)
       rescue Webpack::Rails::Manifest::EntryPointMissingError
         # no bundle exists for this path
       end
 
-      segments.pop
+      route.pop
     end
 
     javascript_include_tag(*bundles)

app/mailers/emails/members.rb

@@ -7,18 +7,11 @@ module Emails
       helper_method :member_source, :member
     end
 
-    def member_access_requested_email(member_source_type, member_id)
+    def member_access_requested_email(member_source_type, member_id, recipient_notification_email)
       @member_source_type = member_source_type
       @member_id = member_id
 
-      admins = member_source.members.owners_and_masters.pluck(:notification_email)
-      # A project in a group can have no explicit owners/masters, in that case
-      # we fallbacks to the group's owners/masters.
-      if admins.empty? && member_source.respond_to?(:group) && member_source.group
-        admins = member_source.group.members.owners_and_masters.pluck(:notification_email)
-      end
-
-      mail(to: admins,
+      mail(to: recipient_notification_email,
            subject: subject("Request to join the #{member_source.human_name} #{member_source.model_name.singular}"))
     end
 

app/models/ci/build.rb

@@ -41,41 +41,12 @@ module Ci
 
     scope :unstarted, ->() { where(runner_id: nil) }
     scope :ignore_failures, ->() { where(allow_failure: false) }
-
-    # This convoluted mess is because we need to handle two cases of
-    # artifact files during the migration. And a simple OR clause
-    # makes it impossible to optimize.
-
-    # Instead we want to use UNION ALL and do two carefully
-    # constructed disjoint queries. But Rails cannot handle UNION or
-    # UNION ALL queries so we do the query in a subquery and wrap it
-    # in an otherwise redundant WHERE IN query (IN is fine for
-    # non-null columns).
-
-    # This should all be ripped out when the migration is finished and
-    # replaced with just the new storage to avoid the extra work.
-
     scope :with_artifacts, ->() do
-      old = Ci::Build.select(:id).where(%q[artifacts_file <> ''])
-      new = Ci::Build.select(:id).where(%q[(artifacts_file IS NULL OR artifacts_file = '') AND EXISTS (?)],
-                                        Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id'))
-      where('ci_builds.id IN (? UNION ALL ?)', old, new)
+      where('(artifacts_file IS NOT NULL AND artifacts_file <> ?) OR EXISTS (?)',
+        '', Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id'))
     end
-
-    scope :with_artifacts_not_expired, ->() do
-      old = Ci::Build.select(:id).where(%q[artifacts_file <> '' AND (artifacts_expire_at IS NULL OR artifacts_expire_at > ?)], Time.now)
-      new = Ci::Build.select(:id).where(%q[(artifacts_file IS NULL OR artifacts_file = '') AND EXISTS (?)],
-                                        Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id AND (expire_at IS NULL OR expire_at > ?)', Time.now))
-      where('ci_builds.id IN (? UNION ALL ?)', old, new)
-    end
-
-    scope :with_expired_artifacts, ->() do
-      old = Ci::Build.select(:id).where(%q[artifacts_file <> '' AND artifacts_expire_at < ?], Time.now)
-      new = Ci::Build.select(:id).where(%q[(artifacts_file IS NULL OR artifacts_file = '') AND EXISTS (?)],
-                                        Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id AND expire_at < ?', Time.now))
-      where('ci_builds.id IN (? UNION ALL ?)', old, new)
-    end
-
+    scope :with_artifacts_not_expired, ->() { with_artifacts.where('artifacts_expire_at IS NULL OR artifacts_expire_at > ?', Time.now) }
+    scope :with_expired_artifacts, ->() { with_artifacts.where('artifacts_expire_at < ?', Time.now) }
     scope :last_month, ->() { where('created_at > ?', Date.today - 1.month) }
     scope :manual_actions, ->() { where(when: :manual, status: COMPLETED_STATUSES + [:manual]) }
     scope :ref_protected, -> { where(protected: true) }

app/models/commit.rb

@@ -417,6 +417,10 @@ class Commit
     !!(title =~ WIP_REGEX)
   end
 
+  def merged_merge_request?(user)
+    !!merged_merge_request(user)
+  end
+
   private
 
   def commit_reference(from, referable_commit_id, full: false)
@@ -445,10 +449,6 @@ class Commit
     changes
   end
 
-  def merged_merge_request?(user)
-    !!merged_merge_request(user)
-  end
-
   def merged_merge_request_no_cache(user)
     MergeRequestsFinder.new(user, project_id: project.id).find_by(merge_commit_sha: id) if merge_commit?
   end

app/models/key.rb

@@ -33,9 +33,8 @@ class Key < ActiveRecord::Base
   after_destroy :refresh_user_cache
 
   def key=(value)
-    value&.delete!("\n\r")
-    value.strip! unless value.blank?
-    write_attribute(:key, value)
+    write_attribute(:key, value.present? ? Gitlab::SSHPublicKey.sanitize(value) : nil)
+
     @public_key = nil
   end
 
@@ -97,7 +96,7 @@ class Key < ActiveRecord::Base
   def generate_fingerprint
     self.fingerprint = nil
 
-    return unless self.key.present?
+    return unless public_key.valid?
 
     self.fingerprint = public_key.fingerprint
   end

app/models/repository.rb

@@ -492,12 +492,8 @@ class Repository
   end
 
   def root_ref
-    if raw_repository
-      raw_repository.root_ref
-    else
-      # When the repo does not exist we raise this error so no data is cached.
-      raise Gitlab::Git::Repository::NoRepository
-    end
+    # When the repo does not exist, or there is no root ref, we raise this error so no data is cached.
+    raw_repository&.root_ref or raise Gitlab::Git::Repository::NoRepository # rubocop:disable Style/AndOr
   end
   cache_method :root_ref
 

app/models/user.rb

@@ -59,6 +59,8 @@ class User < ActiveRecord::Base
   # Override Devise::Models::Trackable#update_tracked_fields!
   # to limit database writes to at most once every hour
   def update_tracked_fields!(request)
+    return if Gitlab::Database.read_only?
+
     update_tracked_fields(request)
 
     lease = Gitlab::ExclusiveLease.new("user_update_tracked_fields:#{id}", timeout: 1.hour.to_i)

app/services/issues/move_service.rb

@@ -48,7 +48,8 @@ module Issues
       new_params = { id: nil, iid: nil, label_ids: cloneable_label_ids,
                      milestone_id: cloneable_milestone_id,
                      project: @new_project, author: @old_issue.author,
-                     description: rewrite_content(@old_issue.description) }
+                     description: rewrite_content(@old_issue.description),
+                     assignee_ids: @old_issue.assignee_ids }
 
       new_params = @old_issue.serializable_hash.symbolize_keys.merge(new_params)
       CreateService.new(@new_project, @current_user, new_params).execute

app/services/notification_service.rb

@@ -208,7 +208,12 @@ class NotificationService
   def new_access_request(member)
     return true unless member.notifiable?(:subscription)
 
-    mailer.member_access_requested_email(member.real_source_type, member.id).deliver_later
+    recipients = member.source.members.owners_and_masters
+    if fallback_to_group_owners_masters?(recipients, member)
+      recipients = member.source.group.members.owners_and_masters
+    end
+
+    recipients.each { |recipient| deliver_access_request_email(recipient, member) }
   end
 
   def decline_access_request(member)
@@ -435,4 +440,14 @@ class NotificationService
   def notifiable_users(*args)
     NotificationRecipientService.notifiable_users(*args)
   end
+
+  def deliver_access_request_email(recipient, member)
+    mailer.member_access_requested_email(member.real_source_type, member.id, recipient.user.notification_email).deliver_later
+  end
+
+  def fallback_to_group_owners_masters?(recipients, member)
+    return false if recipients.present?
+
+    member.source.respond_to?(:group) && member.source.group
+  end
 end

app/views/devise/sessions/two_factor.html.haml

 - if inject_u2f_api?
   - content_for :page_specific_javascripts do
-    = page_specific_javascript_bundle_tag('u2f')
+    = webpack_bundle_tag('u2f')
 
 %div
   = render 'devise/shared/tab_single', tab_title: 'Two-Factor Authentication'

app/views/profiles/_head.html.haml

 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('profile')
+  = webpack_bundle_tag('profile')

app/views/profiles/two_factor_auths/show.html.haml

@@ -6,8 +6,8 @@
 
 - content_for :page_specific_javascripts do
   - if inject_u2f_api?
-    = page_specific_javascript_bundle_tag('u2f')
-  = page_specific_javascript_bundle_tag('two_factor_auth')
+    = webpack_bundle_tag('u2f')
+  = webpack_bundle_tag('two_factor_auth')
 
 .js-two-factor-auth{ 'data-two-factor-skippable' => "#{two_factor_skippable?}", 'data-two_factor_skip_url' => skip_profile_two_factor_auth_path }
   .row.prepend-top-default

app/views/projects/blob/_upload.html.haml

@@ -29,4 +29,4 @@
                 = commit_in_fork_help
 
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('blob')
+  = webpack_bundle_tag('blob')

app/views/projects/blob/edit.html.haml

@@ -3,7 +3,7 @@
 - page_title "Edit", @blob.path, @ref
 - content_for :page_specific_javascripts do
   = page_specific_javascript_tag('lib/ace.js')
-  = page_specific_javascript_bundle_tag('blob')
+  = webpack_bundle_tag('blob')
 
 %div{ class: container_class }
   - if @conflict

app/views/projects/blob/new.html.haml

@@ -2,7 +2,7 @@
 - page_title "New File", @path.presence, @ref
 - content_for :page_specific_javascripts do
   = page_specific_javascript_tag('lib/ace.js')
-  = page_specific_javascript_bundle_tag('blob')
+  = webpack_bundle_tag('blob')
 .editor-title-row
   %h3.page-title.blob-new-page-title
     New file

app/views/projects/blob/viewers/_balsamiq.html.haml

 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('balsamiq_viewer')
+  = webpack_bundle_tag('balsamiq_viewer')
 
 .file-content.balsamiq-viewer#js-balsamiq-viewer{ data: { endpoint: blob_raw_path } }

app/views/projects/blob/viewers/_notebook.html.haml

 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('notebook_viewer')
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag('notebook_viewer')
 
 .file-content#js-notebook-viewer{ data: { endpoint: blob_raw_path } }

app/views/projects/blob/viewers/_pdf.html.haml

 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('pdf_viewer')
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag('pdf_viewer')
 
 .file-content#js-pdf-viewer{ data: { endpoint: blob_raw_path } }

app/views/projects/blob/viewers/_sketch.html.haml

 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('sketch_viewer')
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag('sketch_viewer')
 
 .file-content#js-sketch-viewer{ data: { endpoint: blob_raw_path } }
   .js-loading-icon.text-center.prepend-top-default.append-bottom-default.js-loading-icon{ 'aria-label' => 'Loading Sketch preview' }

app/views/projects/blob/viewers/_stl.html.haml

 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('stl_viewer')
+  = webpack_bundle_tag('stl_viewer')
 
 .file-content.is-stl-loading
   .text-center#js-stl-viewer{ data: { endpoint: blob_raw_path } }

app/views/projects/commit/_pipelines_list.haml

@@ -8,5 +8,5 @@
 } }
 
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('commit_pipelines')
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag('commit_pipelines')

app/views/projects/commit/show.html.haml

@@ -7,8 +7,8 @@
 - page_title        "#{@commit.title} (#{@commit.short_id})", "Commits"
 - page_description  @commit.description
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('diff_notes')
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag('diff_notes')
 
 .container-fluid{ class: [limited_container_width, container_class] }
   = render "commit_box"

app/views/projects/cycle_analytics/show.html.haml

 - @no_container = true
 - page_title "Cycle Analytics"
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('cycle_analytics')
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag('cycle_analytics')
 
 #cycle-analytics{ class: container_class, "v-cloak" => "true", data: { request_path: project_cycle_analytics_path(@project) } }
   - if @cycle_analytics_no_data

app/views/projects/environments/folder.html.haml

@@ -2,8 +2,8 @@
 - page_title "Environments"
 
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag("environments_folder")
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag("environments_folder")
 
 #environments-folder-list-view{ data: { endpoint: folder_project_environments_path(@project, @folder, format: :json),
   "folder-name" => @folder,

app/views/projects/environments/index.html.haml

@@ -3,8 +3,8 @@
 - add_to_breadcrumbs("Pipelines", project_pipelines_path(@project))
 
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag("common_vue")
-  = page_specific_javascript_bundle_tag("environments")
+  = webpack_bundle_tag("common_vue")
+  = webpack_bundle_tag("environments")
 
 #environments-list-view{ data: { environments_data: environments_list_data,
   "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s,

app/views/projects/environments/terminal.html.haml

@@ -3,7 +3,7 @@
 
 - content_for :page_specific_javascripts do
   = stylesheet_link_tag "xterm/xterm"
-  = page_specific_javascript_bundle_tag("terminal")
+  = webpack_bundle_tag("terminal")
 
 %div{ class: container_class }
   .top-area

app/views/projects/graphs/charts.html.haml

@@ -2,8 +2,6 @@
 - page_title "Charts"
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag('common_d3')
-  = webpack_bundle_tag('graphs')
-  = webpack_bundle_tag('graphs_charts')
 
 .repo-charts{ class: container_class }
   %h4.sub-header

app/views/projects/graphs/show.html.haml

@@ -2,7 +2,6 @@
 - page_title _('Contributors')
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag('common_d3')
-  = webpack_bundle_tag('graphs')
   = webpack_bundle_tag('graphs_show')
 
 .js-graphs-show{ class: container_class, 'data-project-graph-path': project_graph_path(@project, current_ref, format: :json) }

app/views/projects/issues/show.html.haml

@@ -87,5 +87,5 @@
 
 = render 'shared/issuable/sidebar', issuable: @issue
 
-= page_specific_javascript_bundle_tag('common_vue')
-= page_specific_javascript_bundle_tag('issue_show')
+= webpack_bundle_tag('common_vue')
+= webpack_bundle_tag('issue_show')

app/views/projects/merge_requests/conflicts.html.haml

 - page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('merge_conflicts')
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag('merge_conflicts')
   = page_specific_javascript_tag('lib/ace.js')
 = render "projects/merge_requests/mr_title"
 

app/views/projects/merge_requests/conflicts/show.html.haml

 - page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('merge_conflicts')
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag('merge_conflicts')
   = page_specific_javascript_tag('lib/ace.js')
 = render "projects/merge_requests/mr_title"
 

app/views/projects/network/show.html.haml

 - breadcrumb_title "Graph"
 - page_title "Graph", @ref
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('network')
+  = webpack_bundle_tag('network')
 = render "head"
 %div{ class: container_class }
   .project-network

app/views/projects/pipelines/index.html.haml

@@ -13,5 +13,5 @@
     "ci-lint-path" => ci_lint_path,
     "reset-cache-path" => reset_cache_project_settings_ci_cd_path(@project) } }
 
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('pipelines')
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag('pipelines')

app/views/projects/protected_branches/_index.html.haml

 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('protected_branches')
+  = webpack_bundle_tag('protected_branches')
 
 - content_for :create_protected_branch do
   = render 'projects/protected_branches/create_protected_branch'

app/views/projects/protected_tags/_index.html.haml

 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('protected_tags')
+  = webpack_bundle_tag('protected_tags')
 
 - content_for :create_protected_tag do
   = render 'projects/protected_tags/create_protected_tag'

app/views/projects/registry/repositories/index.html.haml

@@ -14,8 +14,8 @@
     .col-lg-12
       #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json) } }
 
-      = page_specific_javascript_bundle_tag('common_vue')
-      = page_specific_javascript_bundle_tag('registry_list')
+      = webpack_bundle_tag('common_vue')
+      = webpack_bundle_tag('registry_list')
 
   .row.prepend-top-10
     .col-lg-12

app/views/projects/settings/repository/show.html.haml

@@ -3,8 +3,8 @@
 - @content_class = "limit-container-width" unless fluid_layout
 
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('deploy_keys')
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag('deploy_keys')
 
 -# Protected branches & tags use a lot of nested partials.
 -# The shared parts of the views can be found in the `shared` directory.

app/views/shared/issuable/_sidebar.html.haml

 - todo = issuable_todo(issuable)
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('sidebar')
+  = webpack_bundle_tag('common_vue')
+  = webpack_bundle_tag('sidebar')
 
 %aside.right-sidebar.js-right-sidebar.js-issuable-sidebar{ data: { signed: { in: current_user.present? } }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' }
   .issuable-sidebar{ data: { endpoint: "#{issuable_json_path(issuable)}" } }

app/views/shared/snippets/_form.html.haml

 - content_for :page_specific_javascripts do
   = page_specific_javascript_tag('lib/ace.js')
-  = page_specific_javascript_bundle_tag('snippet')
+  = webpack_bundle_tag('snippet')
 
 .snippet-form-holder
   = form_for @snippet, url: url, html: { class: "form-horizontal snippet-form js-requires-input js-quick-submit common-note-form" } do |f|

app/workers/process_commit_worker.rb

@@ -23,27 +23,25 @@ class ProcessCommitWorker
     return unless user
 
     commit = build_commit(project, commit_hash)
-
     author = commit.author || user
 
     process_commit_message(project, commit, user, author, default)
-
     update_issue_metrics(commit, author)
   end
 
   def process_commit_message(project, commit, user, author, default = false)
-    closed_issues = default ? commit.closes_issues(user) : []
+    # this is a GitLab generated commit message, ignore it.
+    return if commit.merged_merge_request?(user)
 
-    unless closed_issues.empty?
-      close_issues(project, user, author, commit, closed_issues)
-    end
+    closed_issues = default ? commit.closes_issues(user) : []
 
+    close_issues(project, user, author, commit, closed_issues) if closed_issues.any?
     commit.create_cross_references!(author, closed_issues)
   end
 
   def close_issues(project, user, author, commit, issues)
     # We don't want to run permission related queries for every single issue,
-    # therefor we use IssueCollection here and skip the authorization check in
+    # therefore we use IssueCollection here and skip the authorization check in
     # Issues::CloseService#execute.
     IssueCollection.new(issues).updatable_by_user(user).each do |issue|
       Issues::CloseService.new(project, author)

changelogs/unreleased/17500-mr-multiple-issues-oxford-comma.yml

+---
+title: Update issue closing pattern to allow variations in punctuation
+merge_request: 17198
+author: Vicky Chijwani
+type: changed

changelogs/unreleased/32564-fix-double-system-closing-notes.yml

+---
+title: Fix duplicate system notes when merging a merge request.
+merge_request: 17035
+author:
+type: fixed

changelogs/unreleased/40552-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key.yml

+---
+title: Sanitize extra blank spaces used when uploading a SSH key
+merge_request: 40552
+author:
+type: fixed

changelogs/unreleased/41949-move.yml

+---
+title: Remember assignee when moving an issue
+merge_request:
+author:
+type: fixed

changelogs/unreleased/42274-group-request-membership-long-too.yml

+---
+title: Fix long list of recipients on group request membership email
+merge_request: 17121
+author: Jacopo Beschi @jacopo-beschi
+type: fixed

changelogs/unreleased/42641-monaco-service-workers-do-not-work-with-cdn-enabled.yml

+---
+title: Fix monaco editor features which were incompatable with GitLab CDN settings
+merge_request: 17021
+author:
+type: fixed

changelogs/unreleased/4826-github-import-wiki-fix-1.yml

+---
+title: "[GitHub Import] Create an empty wiki if wiki import failed"
+merge_request:
+author:
+type: fixed

changelogs/unreleased/dm-dont-cache-nil-root-ref.yml

+---
+title: Don't cache a nil repository root ref to prevent caching issues
+merge_request:
+author:
+type: fixed

changelogs/unreleased/fl-refresh-btn.yml

+---
+title: Show loading button inline in refresh button in MR widget
+merge_request:
+author:
+type: fixed

changelogs/unreleased/expired-ci-artifacts.yml → changelogs/unreleased/flipper-caching.yml

 ---
-title: Change SQL for expired artifacts to use new ci_job_artifacts.expire_at
-merge_request: 16578
+title: Increase feature flag cache TTL to one hour
+merge_request:
 author:
 type: performance

changelogs/unreleased/kp-fix-stacked-bar-progress-value-clipping.yml

+---
+title: Fix single digit value clipping for stacked progress bar
+merge_request: 17217
+author:
+type: fixed

changelogs/unreleased/sh-fix-geo-error-500-gpg-commit.yml

+---
+title: Fix Error 500 when viewing a commit with a GPG signature in Geo
+merge_request:
+author:
+type: fixed

changelogs/unreleased/sh-fix-squash-rebase-utf8-data.yml

+---
+title: Fix squash not working when diff contained non-ASCII data
+merge_request:
+author:
+type: fixed

changelogs/unreleased/sh-guard-read-only-user-updates.yml

+---
+title: Don't attempt to update user tracked fields if database is in read-only
+merge_request:
+author:
+type: fixed

config/initializers/1_settings.rb

@@ -262,7 +262,7 @@ Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].
 Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
 Settings.gitlab['restricted_visibility_levels'] = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
-Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)|[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)' if Settings.gitlab['issue_closing_pattern'].nil?
+Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)|[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?: *,? +and +| *, *)?)|([A-Z][A-Z0-9_]+-\d+))+)' if Settings.gitlab['issue_closing_pattern'].nil?
 Settings.gitlab['default_projects_features'] ||= {}
 Settings.gitlab['webhook_timeout'] ||= 10
 Settings.gitlab['max_attachment_size'] ||= 10

config/initializers/flipper.rb

@@ -8,7 +8,7 @@ Flipper.configure do |config|
     cached_adapter = Flipper::Adapters::ActiveSupportCacheStore.new(
       adapter,
       Rails.cache,
-      expires_in: 10.seconds)
+      expires_in: 1.hour)
 
     Flipper.new(cached_adapter)
   end

config/webpack.config.js

@@ -27,11 +27,11 @@ var pageEntries = glob.sync('pages/**/index.js', { cwd: path.join(ROOT_PATH, 'ap
 
 // filter out entries currently imported dynamically in dispatcher.js
 var dispatcher = fs.readFileSync(path.join(ROOT_PATH, 'app/assets/javascripts/dispatcher.js')).toString();
-var dispatcherChunks = dispatcher.match(/(?!import\('.\/)pages\/[^']+/g);
+var dispatcherChunks = dispatcher.match(/(?!import\(')\.\/pages\/[^']+/g);
 
 pageEntries.forEach(( path ) => {
   let chunkPath = path.replace(/\/index\.js$/, '');
-  if (!dispatcherChunks.includes(chunkPath)) {
+  if (!dispatcherChunks.includes('./' + chunkPath)) {
     let chunkName = chunkPath.replace(/\//g, '.');
     autoEntries[chunkName] = './' + path;
   }
@@ -61,8 +61,6 @@ var config = {
     environments:         './environments/environments_bundle.js',
     environments_folder:  './environments/folder/environments_folder_bundle.js',
     filtered_search:      './filtered_search/filtered_search_bundle.js',
-    graphs:               './graphs/graphs_bundle.js',
-    graphs_charts:        './graphs/graphs_charts.js',
     graphs_show:          './graphs/graphs_show.js',
     help:                 './help/help.js',
     how_to_merge:         './how_to_merge.js',
@@ -282,7 +280,6 @@ var config = {
     new webpack.optimize.CommonsChunkPlugin({
       name: 'common_d3',
       chunks: [
-        'graphs',
         'graphs_show',
         'monitoring',
         'users',

doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md

-# How to configure LDAP with GitLab CE
+---
+author: Chris Wilson
+author_gitlab: MrChrisW
+level: intermediary
+article_type: admin guide
+date: 2017-05-03
+---
 
-> **[Article Type](../../../development/writing_documentation.html#types-of-technical-articles):** admin guide ||
-> **Level:** intermediary ||
-> **Author:** [Chris Wilson](https://gitlab.com/MrChrisW) ||
-> **Publication date:** 2017-05-03
+# How to configure LDAP with GitLab CE
 
 ## Introduction
 

doc/ci/examples/artifactory_and_gitlab/index.md

 ---
 redirect_from: 'https://docs.gitlab.com/ee/articles/artifactory_and_gitlab/index.html'
+author: Fabio Busatto
+author_gitlab: bikebilly
+level: intermediary
+article_type: tutorial
+date: 2017-08-15
 ---
 
 # How to deploy Maven projects to Artifactory with GitLab CI/CD
 
-> **[Article Type](../../../development/writing_documentation.md#types-of-technical-articles):** tutorial ||
-> **Level:** intermediary ||
-> **Author:** [Fabio Busatto](https://gitlab.com/bikebilly) ||
-> **Publication date:** 2017-08-15
-
 ## Introduction
 
 In this article, we will show how you can leverage the power of [GitLab CI/CD](https://about.gitlab.com/features/gitlab-ci-cd/)

doc/ci/examples/laravel_with_gitlab_and_envoy/index.md

 ---
 redirect_from: 'https://docs.gitlab.com/ee/articles/laravel_with_gitlab_and_envoy/index.html'
+author: Mehran Rasulian
+author_gitlab: mehranrasulian
+level: intermediary
+article_type: tutorial
+date: 2017-08-31
 ---
 
 # Test and deploy Laravel applications with GitLab CI/CD and Envoy
 
-> **[Article Type](../../../development/writing_documentation.md#types-of-technical-articles):** tutorial ||
-> **Level:** intermediary ||
-> **Author:** [Mehran Rasulian](https://gitlab.com/mehranrasulian) ||
-> **Publication date:** 2017-08-31
-
 ## Introduction
 
 GitLab features our applications with Continuous Integration, and it is possible to easily deploy the new code changes to the production server whenever we want.

doc/development/changelog.md

@@ -279,8 +279,8 @@ After much discussion we settled on the current solution of one file per entry,
 and then compiling the entries into the overall `CHANGELOG.md` file during the
 [release process].
 
-[boring solution]: https://about.gitlab.com/handbook/#boring-solutions
-[release managers]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-manager.md
+[boring solution]: https://about.gitlab.com/handbook/values/#boring-solutions
+[release managers]: https://gitlab.com/gitlab-org/release/docs/blob/master/quickstart/release-manager.md
 [started brainstorming]: https://gitlab.com/gitlab-org/gitlab-ce/issues/17826
 [release process]: https://gitlab.com/gitlab-org/release-tools