Merge remote-tracking branch 'origin/master' into ce-to-ee

Signed-off-by: Rémy Coutable <remy@rymai.me>

.gitlab-ci.yml

@@ -445,7 +445,7 @@ ee_compat_check:
   retry: 0
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"
-    when: on_failure
+    when: always
     expire_in: 10d
     paths:
       - ee_compat_check/patches/*.patch

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 10.2.0 (2017-11-22)
+
+### Fixed (17 changes)
+
+- Geo - Does not move projects backed by hashed storage when handling renamed events. !3066
+- Geo: Don't sync disabled project wikis. !3109
+- Reconfigure the Geo tracking database pool size when running as Sidekiq. !3181
+- Geo - Ensures that leases were returned. !3241
+- Fix (un)approver names not being shown in plaintext emails. !3266
+- Add post-migration to drain all Geo related redis queues. !3289
+- Prevent the Geo log cursor from running on primary nodes. !3411
+- Reduce the number of Elasticsearch client instances that are created. !3432
+- Fix generated clone URLs for wikis on Geo secondaries. !3448
+- Remove duplicate delete button in epic.
+- Fix: Failed to rebase MR from forked repo.
+- Fix: Geo API bug. Statistic is not collected when prometheus is disabled.
+- Geo - Ensure that repository deletions in a primary node are correctly deleted in a secondary node.
+- Geo: Fix handling of nil values on advanced section in admin screen.
+- Redirect to existing group boards using old URL if there is no subgroup called 'boards'.
+- Geo - Allow Sidekiq to retry failed jobs to rename project repositories.
+- Geo: Ensure database is connected before attempting to check for secondary status.
+
+### Changed (4 changes)
+
+- Add project actions in Audit events. !3160
+- Add group actions in Audit events. !3176
+- Geo: Don't retry repositories or files until everything has been backfilled. !3182
+- Improve Codeclimate UI.
+
+### Performance (1 change)
+
+- Reduce the quiet times between scheduler runs on Geo secondaries. !3185
+
+### Added (19 changes, 1 of them is from the community)
+
+- Make the maximum capacity of Geo backfill operations configurable. !3107
+- Mirrors can now hard fail, keeping them from being retried until a project admin takes action. !3117
+- View/edit epic at group level. !3126
+- Add worker to prune the Geo Event Log. !3172
+- julian7 Add required_groups option to SAML config, to restrict access to GitLab to specific SAML groups. !3223 (Balazs Nagy)
+- Geo: Expire and resync attachments from renamed projects in secondary nodes when using legacy storage. !3259
+- On Secondary read-only Geo Nodes now a flash banner is shown on all pages. !3260
+- Make GeoLogCursor Highly Available. !3305
+- Allow Geo repository sync over HTTPS. !3341
+- Allow persisting board configuration in order to automatically filter issues.
+- Improve error handling.
+- Add epics list and add epics to nav sidebar.
+- Introduce EEU lincese with epics as the first feature.
+- Add ability to create new epics.
+- Add sidebar for epic.
+- Add delete epic button.
+- Allow admins to globally disable all remote mirrors from application settings page.
+- Add support for logging Prometheus metrics for Geo.
+- Use PostgreSQL FDW for Geo downloads.
+
+### Other (2 changes, 1 of them is from the community)
+
+- Suppress MergeableSelector warning candidates in EE-only files. !3225 (Takuya Noguchi)
+- Enhance the documentation for gitlab-ctl replicate-geo-database. !3268
+
+
 ## 10.1.4 (2017-11-14)
 
 - No changes.

app/controllers/admin/application_controller.rb

@@ -3,23 +3,9 @@
 # Automatically sets the layout and ensures an administrator is logged in
 class Admin::ApplicationController < ApplicationController
   before_action :authenticate_admin!
-  before_action :display_read_only_information
   layout 'admin'
 
   def authenticate_admin!
     render_404 unless current_user.admin?
   end
-
-  def display_read_only_information
-    return unless Gitlab::Database.read_only?
-
-    flash.now[:notice] = read_only_message
-  end
-
-  private
-
-  # Overridden in EE
-  def read_only_message
-    _('You are on a read-only GitLab instance.')
-  end
 end

app/models/note.rb

@@ -114,6 +114,7 @@ class Note < ActiveRecord::Base
     includes(:author, :noteable, :updated_by,
              project: [:project_members, { group: [:group_members] }])
   end
+  scope :with_metadata, -> { includes(:system_note_metadata) }
 
   after_initialize :ensure_discussion_id
   before_validation :nullify_blank_type, :nullify_blank_line_code
@@ -177,7 +178,13 @@ class Note < ActiveRecord::Base
   end
 
   def cross_reference?
-    system? && matches_cross_reference_regex?
+    return unless system?
+
+    if force_cross_reference_regex_check?
+      matches_cross_reference_regex?
+    else
+      SystemNoteService.cross_reference?(note)
+    end
   end
 
   def diff_note?
@@ -390,4 +397,10 @@ class Note < ActiveRecord::Base
   def set_discussion_id
     self.discussion_id ||= discussion_class.discussion_id(self)
   end
+
+  def force_cross_reference_regex_check?
+    return unless system?
+
+    SystemNoteMetadata::TYPES_WITH_CROSS_REFERENCES.include?(system_note_metadata&.action)
+  end
 end

app/models/system_note_metadata.rb

 class SystemNoteMetadata < ActiveRecord::Base
+  # These notes's action text might contain a reference that is external.
+  # We should always force a deep validation upon references that are found
+  # in this note type.
+  # Other notes can always be safely shown as all its references are
+  # in the same project (i.e. with the same permissions)
+  TYPES_WITH_CROSS_REFERENCES = %w[
+    commit cross_reference
+    close duplicate
+    relate unrelate
+  ].freeze
+
   ICON_TYPES = %w[
     commit description merge confidential visible label assignee cross_reference
     title time_tracking branch milestone discussion task moved

app/services/system_note_service.rb

@@ -637,6 +637,10 @@ module SystemNoteService
     create_note(NoteSummary.new(issuable, issuable.project, author, body, action: action))
   end
 
+  def cross_reference?(note_text)
+    note_text =~ /\A#{cross_reference_note_prefix}/i
+  end
+
   private
 
   def notes_for_mentioner(mentioner, noteable, notes)

changelogs/unreleased-ee/1144-allow-admins-to-disable-push-mirrors.yml

----
-title: Allow admins to globally disable all remote mirrors from application settings
-  page.
-merge_request:
-author:
-type: added

changelogs/unreleased-ee/1371-audit-project-events.yml

----
-title: Add project actions in Audit events
-merge_request: 3160
-author:
-type: changed

changelogs/unreleased-ee/1372-audit-group-events.yml

----
-title: Add group actions in Audit events
-merge_request: 3176
-author:
-type: changed

changelogs/unreleased-ee/2518-persisted-issue-boards-filter-be.yml

----
-title: Allow persisting board configuration in order to automatically filter issues
-merge_request:
-author:
-type: added

changelogs/unreleased-ee/2524-geo-secondary-help-users-not-waste-time-on-impossible-operations.yml

----
-title: On Secondary read-only Geo Nodes now a flash banner is shown on all pages
-merge_request: 3260
-author:
-type: added

changelogs/unreleased-ee/2548-improve-codeclimate.yml

----
-title: Improve Codeclimate UI
-merge_request:
-author:
-type: changed

changelogs/unreleased-ee/2831-hard-fail-mirror-when-retry-count-number-exceeds-the-limit.yml

----
-title: Mirrors can now hard fail, keeping them from being retried until a project
-  admin takes action.
-merge_request: 3117
-author:
-type: added

changelogs/unreleased-ee/3119-improve-error-recovery.yml

----
-title: Improve error handling
-merge_request:
-author:
-type: added

changelogs/unreleased-ee/3143-saml_required_groups.yml

----
-title: julian7 Add required_groups option to SAML config, to restrict access to GitLab
-  to specific SAML groups.
-merge_request: 3223
-author: Balazs Nagy
-type: added

changelogs/unreleased-ee/3341-geo-http-repo-sync.yml

----
-title: Allow Geo repository sync over HTTPS
-merge_request: 3341
-author:
-type: added

changelogs/unreleased-ee/3508-hashed-storage-sends-a-geo-repository-renamed-event.yml

----
-title: Geo - Does not move projects backed by hashed storage when handling renamed events
-merge_request: 3066
-author:
-type: fixed

changelogs/unreleased-ee/3532-configurable-geo-max-capacity.yml

----
-title: Make the maximum capacity of Geo backfill operations configurable
-merge_request: 3107
-author:
-type: added

changelogs/unreleased-ee/3550-show-epic.yml

----
-title: View/edit epic at group level
-merge_request: 3126
-author:
-type: added

changelogs/unreleased-ee/3553-epics-list.yml

----
-title: Add epics list and add epics to nav sidebar
-merge_request:
-author:
-type: added

changelogs/unreleased-ee/3568-restarting-sidekiq-does-not-cause-leases-to-be-returned.yml

----
-title: Geo - Ensures that leases were returned.
-merge_request: 3241
-author:
-type: fixed

changelogs/unreleased-ee/3569-geo-backfill-unconditional-wiki.yml

----
-title: 'Geo: Don''t sync disabled project wikis'
-merge_request: 3109
-author:
-type: fixed

changelogs/unreleased-ee/3650-persist-elasticsearch-client.yml

----
-title: Reduce the number of Elasticsearch client instances that are created
-merge_request: 3432
-author:
-type: fixed

changelogs/unreleased-ee/3674-attachments-legacy-storage-rename.yml

----
-title: 'Geo: Expire and resync attachments from renamed projects in secondary nodes
-  when using legacy storage'
-merge_request: 3259
-author:
-type: added

changelogs/unreleased-ee/3731-eeu-license.yml

----
-title: Introduce EEU lincese with epics as the first feature
-merge_request:
-author:
-type: added

changelogs/unreleased-ee/3809-geo-sidekiq-pool.yml

----
-title: Reconfigure the Geo tracking database pool size when running as Sidekiq
-merge_request: 3181
-author:
-type: fixed

changelogs/unreleased-ee/3810-geo-disable-retries.yml

----
-title: 'Geo: Don''t retry repositories or files until everything has been backfilled'
-merge_request: 3182
-author:
-type: changed

changelogs/unreleased-ee/3813-reduce-geo-scheduler-quiet-times.yml

----
-title: Reduce the quiet times between scheduler runs on Geo secondaries
-merge_request: 3185
-author:
-type: performance

changelogs/unreleased-ee/3877-expand-replicate-geo-database-docs.yml

----
-title: Enhance the documentation for gitlab-ctl replicate-geo-database
-merge_request: 3268
-author:
-type: other

changelogs/unreleased-ee/3879-suppress-mergeable-selector-in-ee-only-files.yml

----
-title: Suppress MergeableSelector warning candidates in EE-only files
-merge_request: 3225
-author: Takuya Noguchi
-type: other

changelogs/unreleased-ee/3924-approver-emails-text.yml

----
-title: Fix (un)approver names not being shown in plaintext emails
-merge_request: 3266
-author:
-type: fixed

changelogs/unreleased-ee/3937-new-epic.yml

----
-title: Add ability to create new epics
-merge_request:
-author:
-type: added

changelogs/unreleased-ee/39977-git-timeout-for-geo-doc.yml

+---
+title: Document a failure mode for large repositories in Geo
+merge_request: 3500
+author:
+type: other

changelogs/unreleased-ee/4049-log-cursor-runs-on-primary.yml

----
-title: Prevent the Geo log cursor from running on primary nodes
-merge_request: 3411
-author:
-type: fixed

changelogs/unreleased-ee/4054-fix-geo-wiki-clone-instructions.yml

----
-title: Fix generated clone URLs for wikis on Geo secondaries
-merge_request: 3448
-author:
-type: fixed

changelogs/unreleased-ee/4055-geo-api-bugs.yml

----
-title: 'Fix: Geo API bug. Statistic is not collected when prometheus is disabled'
-merge_request:
-author:
-type: fixed

changelogs/unreleased/27654-retry-button.yml → changelogs/unreleased-ee/4114-epic-list-fix.yml

 ---
-title: Move retry button in job page to sidebar
+title: Don't user issuable_sort cookie for epics collection
 merge_request:
 author:
 type: fixed

changelogs/unreleased/fix-subgroup-autocomplete.yml → changelogs/unreleased-ee/4115-enable-scoped-boards-for-early-adopters.yml

 ---
-title: Fix user autocomplete in subgroups
+title: Enable scoped boards for Early Adopters
 merge_request:
 author:
 type: fixed

changelogs/unreleased-ee/add-epic-sidebar.yml

----
-title: Add sidebar for epic
-merge_request:
-author:
-type: added

changelogs/unreleased-ee/da-ensure-repository-deletions-are-communicated-to-secondary.yml

----
-title: Geo - Ensure that repository deletions in a primary node are correctly deleted
-  in a secondary node
-merge_request:
-author:
-type: fixed

changelogs/unreleased-ee/dba-fix-nil-status-count.yml

----
-title: 'Geo: Fix handling of nil values on advanced section in admin screen'
-merge_request:
-author:
-type: fixed

changelogs/unreleased-ee/delete-epic.yml

----
-title: Add delete epic button
-merge_request:
-author:
-type: added

changelogs/unreleased-ee/feature-ha-geologcursor.yml

----
-title: Make GeoLogCursor Highly Available
-merge_request: 3305
-author:
-type: added

changelogs/unreleased-ee/fix-group-boards-redirect.yml

----
-title: Redirect to existing group boards using old URL if there is no subgroup called
-  'boards'
-merge_request:
-author:
-type: fixed

changelogs/unreleased-ee/refactor-geo-move-repository-service.yml

----
-title: Geo - Allow Sidekiq to retry failed jobs to rename project repositories
-merge_request:
-author:
-type: fixed

changelogs/unreleased-ee/remove-duplicate-delete-btn.yml

----
-title: Remove duplicate delete button in epic
-merge_request:
-author:
-type: fixed

changelogs/unreleased-ee/sh-fix-geo-secondary-check.yml

----
-title: 'Geo: Ensure database is connected before attempting to check for secondary
-  status'
-merge_request:
-author:
-type: fixed

changelogs/unreleased-ee/sh-geo-add-prom-metrics.yml

----
-title: Add support for logging Prometheus metrics for Geo
-merge_request: !3187
-author:
-type: added

changelogs/unreleased-ee/sh-rails-fdw-support.yml

----
-title: Use PostgreSQL FDW for Geo downloads
-merge_request:
-author:
-type: added

changelogs/unreleased-ee/tc-geo-drain-queues.yml

----
-title: Add post-migration to drain all Geo related redis queues
-merge_request: 3289
-author:
-type: fixed

changelogs/unreleased-ee/tc-geo-prune-event-log.yml

----
-title: Add worker to prune the Geo Event Log
-merge_request: 3172
-author:
-type: added

changelogs/unreleased-ee/tc-geo-remove-double-banner.yml

+---
+title: Remove duplicate read-only flash message on admin pages
+merge_request: 3495
+author:
+type: fixed

changelogs/unreleased/.yml

----
-title: Remove update merge request worker tagging.
-merge_request:
-author:
-type: removed

changelogs/unreleased/1312-time-spent-at.yml

----
-title: Added possibility to enter past date in /spend command to log time in the past
-merge_request: 3044
-author: g3dinua, LockiStrike
-type: changed

changelogs/unreleased/14970-suggest-rename-remote.yml

----
-title: Suggest to rename the remote for existing repository instructions
-merge_request: 14970
-author: helmo42
-type: added

changelogs/unreleased/20666-404-error-issue-assigned-with-issues-disabled.yml

----
-title: Fixes 404 error to 'Issues assigned to me' and 'Issues I've created' when issues
-  are disabled
-merge_request: 15021
-author: Jacopo Beschi @jacopo-beschi
-type: fixed

changelogs/unreleased/23000-pages-api.yml

----
-title: Add API endpoints for Pages Domains
-merge_request: 13917
-author: Travis Miller
-type: added

changelogs/unreleased/23206-load-participants-async.yml

----
-title: Update participants and subscriptions button in issuable sidebar to be async
-merge_request: 14836
-author:
-type: changed

changelogs/unreleased/26763-grant-registry-auth-scope-to-admins.yml

----
-title: Issue JWT token with registry:catalog:* scope when requested by GitLab admin
-merge_request: 14751
-author: Vratislav Kalenda
-type: added

changelogs/unreleased/27375-dashboard-activity-performance.yml

----
-title: Improve DashboardController#activity.json performance
-merge_request: 14985
-author:
-type: performance

changelogs/unreleased/28202_decrease_abc_threshold_step5.yml

----
-title: Decrease ABC threshold to 54.28
-merge_request: 14920
-author: Maxim Rydkin
-type: other

changelogs/unreleased/30140-restore-readme-only-preference.yml

----
-title: Add readme only option as project view
-merge_request: 14900
-author:
-type: changed

changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml

----
-title: Decrease Perceived Complexity threshold to 14
-merge_request: 14231
-author: Maxim Rydkin
-type: other

changelogs/unreleased/31454-missing-project-id-pipeline-hook-data.yml

----
-title: Adds project_id to pipeline hook data
-merge_request: 15044
-author: Jacopo Beschi @jacopo-beschi
-type: added

changelogs/unreleased/32318-filter-icon.yml

----
-title: Remove filter icon from search bar
-merge_request:
-author:
-type: other

changelogs/unreleased/3274-geo-route-whitelisting.yml

----
-title: Tighten up whitelisting of certain Geo routes
-merge_request: 15082
-author:
-type: fixed

changelogs/unreleased/34284-add-changes-to-issuable-webhook-data.yml

----
-title: Include the changes in issuable webhook payloads
-merge_request: 14308
-author:
-type: added

changelogs/unreleased/34768-fix-issuable-header-wrapping.yml

----
-title: Fix problem with issuable header wrapping when content is too long
-merge_request:
-author:
-type: fixed

changelogs/unreleased/34841-todos.yml

----
-title: Fix bad type checking to prevent 0 count badge to be shown
-merge_request:
-author:
-type: fixed

changelogs/unreleased/34897-delete-branch-after-merge.yml

----
-title: Fixed 'Removed source branch' checkbox in merge widget being ignored.
-merge_request: 14832
-author:
-type: fixed

changelogs/unreleased/35199-case-insensitive-branches-search.yml

----
-title: Case insensitive search for branches
-merge_request: 14995
-author: George Andrinopoulos
-type: fixed

changelogs/unreleased/35644-refactor-have-http-status-into-have-gitlab-http-status.yml

----
-title: Refactor have_http_status into have_gitlab_http_status
-merge_request: 14958
-author: Jacopo Beschi @jacopo-beschi
-type: added

changelogs/unreleased/35652-prometheus-service-page-shows-error.yml

----
-title: Fix flash errors showing up on a non configured prometheus integration
-merge_request: 35652
-author:
-type: fixed

changelogs/unreleased/35914-merge-request-update-worker-is-slow.yml

----
-title: Add metric tagging for sidekiq workers
-merge_request: 15111
-author:
-type: added

changelogs/unreleased/3615-improve-welcome-screen.yml

----
-title: Reorganize welcome page for new users
-merge_request:
-author:
-type: other

changelogs/unreleased/36160-zindex.yml

----
-title: Decreases z-index of select2 to a lower number of our navigation bar
-merge_request:
-author:
-type: fixed

changelogs/unreleased/36629-35958-add-cluster-application-section.yml

----
-title: Add applications section to GKE clusters page to easily install Helm Tiller,
-  Ingress
-merge_request:
-author:
-type: added

changelogs/unreleased/3674-hashed-storage-attachments.yml

----
-title: Hashed Storage support for Attachments
-merge_request: 15068
-author:
-type: added

changelogs/unreleased/37032-get-project-branch-invalid-name-message.yml

----
-title: Get Project Branch API shows an helpful error message on invalid refname
-merge_request: 14884
-author: Jacopo Beschi @jacopo-beschi
-type: added

changelogs/unreleased/37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request.yml

----
-title: Improve performance of the /projects/:id/repository/branches API endpoint
-merge_request: 15215
-author:
-type: performance

changelogs/unreleased/37473-expose-project-visibility-as-ci-variable.yml

----
-title: Expose project visibility as CI variable - CI_PROJECT_VISIBILITY
-merge_request: 15193
-author:
-type: added

changelogs/unreleased/37571-replace-wikipage-createservice-with-factory.yml

----
-title: Replace WikiPage::CreateService calls with wiki_page factory in specs
-merge_request: 14850
-author: Jacopo Beschi @jacopo-beschi
-type: changed

changelogs/unreleased/37631-add-a-merge_request_diff_id-column-to-merge_requests.yml

----
-title: Add a latest_merge_request_diff_id column to merge_requests
-merge_request: 15035
-author:
-type: performance

changelogs/unreleased/37660-match-sidebar-colors.yml

----
-title: Change background color of nav sidebar to match other gl sidebars
-merge_request:
-author:
-type: changed

changelogs/unreleased/37824-many-branches-lock-server.yml

----
-title: While displaying a commit, do not show list of related branches if there are
-  thousands of branches
-merge_request: 14812
-author:
-type: other

changelogs/unreleased/37978-extra-border-radius-while-editing-a-file.yml

----
-title: Removed extra border radius from .file-editor and .file-holder when editing
-  a file
-merge_request: 14803
-author: Rachel Pipkin
-type: fixed

changelogs/unreleased/38178-fl-mr-notes-components.yml

----
-title: Moves placeholders components into shared folder with documentation. Makes
-  them easier to reuse in MR and Snippets comments
-merge_request:
-author:
-type: other

changelogs/unreleased/38236-remove-build-failed-todo-if-it-has-been-auto-retried.yml

----
-title: Don't create build failed todos when the job is automatically retried
-merge_request:
-author:
-type: fixed

changelogs/unreleased/38247-hide-create-mr-button-in-issue-show.yml

----
-title: Remove create MR button from issues when MRs are disabled
-merge_request: 15071
-author: George Andrinopoulos
-type: fixed

changelogs/unreleased/38394-smarter-interval.yml

----
-title: Update Merge Request polling so there is only one request at a time
-merge_request: 15032
-author:
-type: fixed

changelogs/unreleased/38395-mr-widget-ci.yml

----
-title: Moves mini graph of pipeline to the end of sentence in MR widget. Cleans HTML
-  and tests
-merge_request:
-author:
-type: fixed

changelogs/unreleased/38589-internationalize-tags-page.yml

----
-title: Internationalized tags page
-merge_request: 38589
-author:
-type: other

changelogs/unreleased/38677-render-new-discussions-on-diff-tab.yml

----
-title: Add new diff discussions on MR diffs tab in "realtime"
-merge_request: 14981
-author:
-type: fixed

changelogs/unreleased/38720-sort-admin-runners.yml

----
-title: Add sort runners on admin runners
-merge_request: 14661
-author: Takuya Noguchi
-type: added

changelogs/unreleased/38871-cleanup-data-page-attribute-after-karma-test.yml

----
-title: Cleanup data-page attribute after each Karma test
-merge_request: 14742
-author:
-type: fixed

changelogs/unreleased/38986-due-date.yml

----
-title: Fix timezone bug in Pikaday and upgrade Pikaday version
-merge_request:
-author:
-type: fixed

changelogs/unreleased/39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles.yml

----
-title: Removed d3.js from the graph and users bundles and used the common_d3 bundle
-  instead
-merge_request: 14826
-author:
-type: other

changelogs/unreleased/39035-move-gitlab-export-to-top-import-list.yml

----
-title: 14830 Move GitLab export option to top of import list when creating a new project
-merge_request:
-author:
-type: changed

changelogs/unreleased/39109-reenable-scroll-job.yml

----
-title: Enables scroll to bottom once user has scrolled back to bottom in job log
-merge_request:
-author:
-type: fixed