Merge branch 'master' into 'api-notes-entity-fields'

# Conflicts:
#   doc/api/v3_to_v4.md

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 8.17.0 (2017-02-22)
+
+- Read-only "auditor" user role. !998
+- Also reset approvals on push when merge request is closed. !1051
+- Copy commit SHA to clipboard. !1066
+- Pull EE specific Gitlab::Auth code in to its own module. !1112
+- Geo: Added `gitlab:geo:check` and improved `gitlab:envinfo` rake tasks. !1120
+- Geo: send the new event type with the backfill function. !1157
+- Re-add removed params from projects and issues V3 API. !1209
+- Add configurable minimum mirror sync time in admin section. !1217
+- Move RepositoryUpdateRemoteMirrorWorker jobs to project_mirror Sidekiq queue. !1234
+- Change Builds word to Pipelines in Mirror settings page.
+- Fix bundle tag in anaytics page.
+- Support v4 API for GitLab Geo endpoints.
+- Fixed merge request environment link not displaying.
+- Reduce queries needed to check if node is a primary or secondary Geo node.
+- Allow squashing merge requests into a single commit.
+
 ## 8.16.6 (2017-02-17)
 
 - Geo: send the new event type with the backfill function. !1157

app/assets/javascripts/admin_email_select.js

@@ -25,7 +25,7 @@
                 all = {
                   id: "all"
                 };
-                data = $.merge([all], groups[0], projects[0]);
+                data = [all].concat(groups[0], projects[0]);
                 return query.callback({
                   results: data
                 });

app/models/concerns/elastic/application_search.rb

@@ -141,7 +141,7 @@ module Elastic
         {
           query: {
             bool: {
-               must: [{ term: { iid: iid } }]
+               filter: [{ term: { iid: iid } }]
             }
           }
         }
@@ -155,7 +155,8 @@ module Elastic
             options[:public_and_internal_projects]
           )
 
-          query_hash[:query][:bool][:filter] = {
+          query_hash[:query][:bool][:filter] ||= []
+          query_hash[:query][:bool][:filter] << {
             has_parent: {
               parent_type: "project",
               query: {

app/models/concerns/elastic/issues_search.rb

@@ -79,7 +79,7 @@ module Elastic
                    { term: { confidential: false } }
                  end
 
-        query_hash[:query][:bool][:must] << filter
+        query_hash[:query][:bool][:filter] << filter
         query_hash
       end
     end

app/services/files/multi_service.rb

@@ -55,7 +55,7 @@ module Files
       file_path = action[:file_path]
       file_path = action[:previous_path] if action[:action] == :move
 
-      blob = repository.blob_at_branch(params[:branch_name], file_path)
+      blob = repository.blob_at_branch(params[:branch], file_path)
 
       unless blob
         raise_error("File to be #{action[:action]}d `#{file_path}` does not exist.")
@@ -89,7 +89,7 @@ module Files
     def validate_create(action)
       return if project.empty_repo?
 
-      if repository.blob_at_branch(params[:branch_name], action[:file_path])
+      if repository.blob_at_branch(params[:branch], action[:file_path])
         raise_error("Your changes could not be committed because a file with the name `#{action[:file_path]}` already exists.")
       end
     end
@@ -102,14 +102,14 @@ module Files
         raise_error("You must supply the original file path when moving file `#{action[:file_path]}`.")
       end
 
-      blob = repository.blob_at_branch(params[:branch_name], action[:file_path])
+      blob = repository.blob_at_branch(params[:branch], action[:file_path])
 
       if blob
         raise_error("Move destination `#{action[:file_path]}` already exists.")
       end
 
       if action[:content].nil?
-        blob = repository.blob_at_branch(params[:branch_name], action[:previous_path])
+        blob = repository.blob_at_branch(params[:branch], action[:previous_path])
         blob.load_all_data!(repository) if blob.truncated?
         params[:actions][index][:content] = blob.data
       end

changelogs/unreleased-ee/1439-read-only-user.yml

----
-title: Read-only "auditor" user role
-merge_request: 998
-author:

changelogs/unreleased-ee/1457-reset-approvals-on-closed-mrs.yml

----
-title: Also reset approvals on push when merge request is closed
-merge_request: 1051
-author:

changelogs/unreleased-ee/1611-geo-improve-info-rake-task.yml

----
-title: 'Geo: Added `gitlab:geo:check` and improved `gitlab:envinfo` rake tasks'
-merge_request: 1120
-author:

changelogs/unreleased-ee/1656-fix-admin-user-email-recipient-select-list.yml

+---
+title: Fix admin email notification recipient group select list
+merge_request:
+author:

changelogs/unreleased-ee/1698-add-removed-params-from-v3-projects-api.yml

----
-title: Re-add removed params from projects and issues V3 API
-merge_request: 1209
-author:

changelogs/unreleased-ee/17662-rename-builds-mirror.yml

----
-title: Change Builds word to Pipelines in Mirror settings page
-merge_request:
-author:

changelogs/unreleased-ee/28038-fix-ee-bundle-tag.yml

----
-title: Fix bundle tag in anaytics page
-merge_request:
-author:

changelogs/unreleased-ee/clipboard-button-commit-sha-ee.yml

----
-title: 'Copy commit SHA to clipboard'
-merge_request: 1066

changelogs/unreleased/27240-make-progress-bars-consistent.yml → changelogs/unreleased-ee/es_filter_scope_for_iid_search.yml

 ---
-title: 27240 Make progress bars consistent
+title: "[Elasticsearch] More efficient search"
 merge_request:
 author:

changelogs/unreleased-ee/geo-apiv4-fix.yml

----
-title: Support v4 API for GitLab Geo endpoints
-merge_request:
-author:

changelogs/unreleased-ee/gitlab_auth_move_ee_to_module.yml

----
-title: Pull EE specific Gitlab::Auth code in to its own module
-merge_request: 1112
-author:

changelogs/unreleased-ee/global-minimum-mirror-sync-time.yml

----
-title: Add configurable minimum mirror sync time in admin section
-merge_request: 1217
-author:

changelogs/unreleased-ee/squash.yml

----
-title: Allow squashing merge requests into a single commit
-merge_request:
-author:

changelogs/unreleased/17662-rename-builds.yml

----
-title: Rename Builds to Pipelines, CI/CD Pipelines, or Jobs everywhere
-merge_request: 8787
-author:

changelogs/unreleased/20452-remove-require-from-request_profiler-initializer.yml

----
-title: Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb
-merge_request:
-author:

changelogs/unreleased/20852-getting-started-project-better-blank-state-for-labels-view.yml

----
-title: Added labels empty state
-merge_request: 7443
-author: 

changelogs/unreleased/21518_recaptcha_spam_issues.yml

----
-title: Use reCaptcha when an issue is identified as a spam
-merge_request: 8846
-author:

changelogs/unreleased/22007-unify-projects-search.yml

----
-title: Unify projects search by removing /projects/:search endpoint
-merge_request: 8877
-author:

changelogs/unreleased/22132-rename-branch-name-params-to-branch.yml

+---
+title: Standardize branch name params as branch on V4 API
+merge_request: 8936
+author:

changelogs/unreleased/22638-creating-a-branch-matching-a-wildcard-fails.yml

----
-title: Allow creating protected branches when user can merge to such branch
-merge_request: 8458
-author:

changelogs/unreleased/22974-trigger-service-events-through-api.yml

----
-title: Adds service trigger events to api
-merge_request: 8324
-author:

changelogs/unreleased/23524-notify-automerge-user-of-failed-build.yml

----
-title: Create a TODO for user who set auto-merge when a build fails, merge conflict occurs
-merge_request: 8056
-author: twonegatives

changelogs/unreleased/23634-remove-project-grouping.yml

----
-title: Don't group issues by project on group-level and dashboard issue indexes.
-merge_request: 8111
-author: Bernardo Castro

changelogs/unreleased/23767-disable-storing-of-sensitive-information.yml

----
-title: Fix disable storing of sensitive information when importing a new repo
-merge_request: 8885
-author: Bernard Pietraga

changelogs/unreleased/24147-delete-env-button.yml

----
-title: Adds back ability to stop all environments
-merge_request: 7379
-author:

changelogs/unreleased/24606-force-password-reset-on-next-login.yml

----
-title: Force new password after password reset via API
-merge_request:
-author: George Andrinopoulos

changelogs/unreleased/24716-fix-ctrl-click-links.yml

----
-title: Fix Ctrl+Click support for Todos and Merge Request page tabs
-merge_request: 8898
-author:

changelogs/unreleased/24795_refactor_merge_request_build_service.yml

----
-title: Refactor MergeRequests::BuildService
-merge_request: 8462
-author: Rydkin Maxim

changelogs/unreleased/24833-Allow-to-search-by-commit-hash-within-project.yml

----
-title: 'Allows to search within project by commit hash'
-merge_request: 
-author: YarNayar

changelogs/unreleased/24923_nested_tasks.yml

----
-title: Fix nested tasks in ordered list
-merge_request: 8626
-author:

changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml

----
-title: Show organisation membership and delete comment on smaller viewports, plus change comment author name to username
-merge_request:
-author:

changelogs/unreleased/25312-search-input-cmd-click-issue.yml

----
-title: Prevent removal of input fields if it is the parent dropdown element
-merge_request: 8397
-author:

changelogs/unreleased/25360-remove-flash-warning-from-login-page.yml

----
-title: Remove flash warning from login page
-merge_request: 8864
-author: Gerald J. Padilla

changelogs/unreleased/25460-replace-word-users-with-members.yml

----
-title: Replace word user with member
-merge_request: 8872
-author:

changelogs/unreleased/25624-anticipate-obstacles-to-removing-turbolinks.yml

----
-title: Remove turbolinks.
-merge_request: !8570
-author:

changelogs/unreleased/25811-pipeline-number-and-url-do-not-update-when-new-pipeline-is-triggered.yml

----
-title: Update pipeline and commit links when CI status is updated
-merge_request: 8351
-author:

changelogs/unreleased/25910-convert-manual-action-icons-to-svg-to-propperly-position-them.yml

----
-title: Convert pipeline action icons to svg to have them propperly positioned
-merge_request:
-author:

changelogs/unreleased/25989-fix-rogue-scrollbars-on-comments.yml

----
-title: Remove rogue scrollbars for issue comments with inline elements
-merge_request:
-author:

changelogs/unreleased/26059-segoe-ui-vertical.yml

----
-title: Align Segoe UI label text
-merge_request:
-author:

changelogs/unreleased/26068_tasklist_issue.yml

----
-title: Don’t count tasks that are not defined as list items correctly
-merge_request: 8526
-author:

changelogs/unreleased/26117-sort-pipeline-for-commit.yml

----
-title: Add sorting pipeline for a commit
-merge_request: 8319
-author: Takuya Noguchi

changelogs/unreleased/26186-diff-view-plus-and-minus-signs-as-part-of-line-number.yml

----
-title: Color + and - signs in diffs to increase code legibility
-merge_request:
-author:

changelogs/unreleased/26445-accessible-piplelines-buttons.yml

----
-title: Improve button accessibility on pipelines page
-merge_request: 8561
-author:

changelogs/unreleased/26447-fix-tab-list-order.yml

----
-title: Fix tab index order on branch commits list page
-merge_request:
-author: Ryan Harris

changelogs/unreleased/26468-fix-users-sort-in-admin-area.yml

----
-title: Fix Sort by Recent Sign-in in Admin Area
-merge_request: 8637
-author: Poornima M

changelogs/unreleased/26787-add-copy-icon-hover-state.yml

----
-title: Add hover style to copy icon on commit page header
-merge_request:
-author: Ryan Harris

changelogs/unreleased/26824-diff-unfold-link-is-still-visible-when-there-are-no-lines-to-unfold.yml

----
-title: prevent diff unfolding link from appearing when there are no more lines to
-  show
-merge_request: 8761
-author:

changelogs/unreleased/26852-fix-slug-for-openshift.yml

----
-title: Avoid repeated dashes in $CI_ENVIRONMENT_SLUG
-merge_request: 8638
-author:

changelogs/unreleased/26920-hover-cursor-on-pagination-element.yml

----
-title: Fixes hover cursor on pipeline pagenation
-merge_request: 9003
-author:

changelogs/unreleased/26947-build-status-self-link.yml

----
-title: Add link verification to badge partial in order to render a badge without a link
-merge_request: 8740
-author:

changelogs/unreleased/26982-improve-pipeline-status-icon-linking-in-widgets.yml

----
-title: Improve pipeline status icon linking in widgets
-merge_request:
-author:

changelogs/unreleased/27013-regression-in-commit-title-bar.yml

----
-title: Fix commit title bar and repository view copy clipboard button order on last commit in repository view
-merge_request:
-author:

changelogs/unreleased/27014-fix-pipeline-tooltip-wrapping.yml

----
-title: Fix mini-pipeline stage tooltip text wrapping
-merge_request:
-author:

changelogs/unreleased/27021-line-numbers-now-in-copy-pasta-data.yml

----
-title: Prevent copying of line numbers in parallel diff view
-merge_request: 8706
-author:

changelogs/unreleased/27178-update-builds-link-in-project-settings.yml

----
-title: Updated builds info link on the project settings page
-merge_request:
-author: Ryan Harris

changelogs/unreleased/27277-small-mini-pipeline-graph-glitch-upon-hover.yml

----
-title: fixed small mini pipeline graph line glitch
-merge_request: 8804
-author:

changelogs/unreleased/27291-unify-mr-diff-file-buttons.yml

----
-title: Unify MR diff file button style
-merge_request: 8874
-author:

changelogs/unreleased/27321-double-separator-line-in-edit-projects-settings.yml

----
-title: Only render hr when user can't archive project.
-merge_request: !8917
-author:

changelogs/unreleased/27332-mini-pipeline-graph-with-many-stages-has-no-line-spacing-in-firefox-and-safari.yml

----
-title: Fix pipeline graph vertical spacing in Firefox and Safari
-merge_request: 8886
-author:

changelogs/unreleased/27352-search-label-filter-header.yml

----
-title: 27352-search-label-filter-header
-merge_request:
-author:

changelogs/unreleased/27395-reduce-group-activity-sql-queries-2.yml

----
-title: Include :author, :project, and :target in Event.with_associations
-merge_request:
-author:

changelogs/unreleased/27395-reduce-group-activity-sql-queries.yml

----
-title: Don't instantiate AR objects in Event.in_projects
-merge_request:
-author:

changelogs/unreleased/27484-environment-show-name.yml

----
-title: Don't capitalize environment name in show page
-merge_request:
-author:

changelogs/unreleased/27488-fix-jwt-version.yml

----
-title: Update and pin the `jwt` gem to ~> 1.5.6
-merge_request:
-author:

changelogs/unreleased/27494-environment-list-column-headers.yml

----
-title: Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles
-merge_request:
-author:

changelogs/unreleased/27602-fix-avatar-border-flicker-mention-dropdown.yml

----
-title: Fixes flickering of avatar border in mention dropdown
-merge_request: 8950
-author:

changelogs/unreleased/27632_fix_mr_widget_url.yml

----
-title: Fix MR widget url
-merge_request: 8989
-author:

changelogs/unreleased/27639-emoji-panel-under-the-side-panel-in-the-merge-request.yml

----
-title: Layer award emoji dropdown over the right sidebar
-merge_request: 9004
-author:

changelogs/unreleased/27656-doc-ci-enable-ci.yml

----
-title: Update doc for enabling or disabling GitLab CI
-merge_request: 8965
-author: Takuya Noguchi

changelogs/unreleased/27774-text-color-contrast-is-barely-readable-for-pipelines-visualization-graph-page-with-roboto-fonts.yml

----
-title: Give ci status text on pipeline graph a better font-weight
-merge_request:
-author:

changelogs/unreleased/27822-default-bulk-assign-labels.yml

----
-title: Add default labels to bulk assign dropdowns
-merge_request:
-author:

changelogs/unreleased/27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects.yml

----
-title: Only return target project's comments for a commit
-merge_request:
-author:

changelogs/unreleased/27880-pipelines-table-not-showing-commit-branch.yml

----
-title: Fixes Pipelines table is not showing branch name for commit
-merge_request:
-author:

changelogs/unreleased/27883-autocomplete-seems-to-not-trigger-when-at-character-is-part-of-an-autocompleted-text.yml

----
-title: Trigger autocomplete after selecting a slash command
-merge_request: 9117
-author:

changelogs/unreleased/27922-cmd-click-todo-doesn-t-work.yml

----
-title: Fix regression where cmd-click stopped working for todos and merge request
-  tabs
-merge_request:
-author:

changelogs/unreleased/27925-fix-mr-stray-pipelines-api-request.yml

----
-title: Fix stray pipelines API request when showing MR
-merge_request:
-author:

changelogs/unreleased/27932-merge-request-pipelines-displays-json.yml

----
-title: Fix Merge request pipelines displays JSON
-merge_request:
-author:

changelogs/unreleased/27939-fix-current-build-arrow.yml

----
-title: Fix current build arrow indicator
-merge_request:
-author:

changelogs/unreleased/27943-contribution-list-on-profile-page-is-aligned-right.yml

----
-title: Fix contribution activity alignment
-merge_request:
-author:

changelogs/unreleased/27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget.yml

----
-title: Add space between text and loading icon in Megre Request Widget
-merge_request: 9119
-author:

changelogs/unreleased/27955-mr-notification-use-pipeline-language.yml

----
-title: Show Pipeline(not Job) in MR desktop notification
-merge_request:
-author:

changelogs/unreleased/27963-tooltips-jobs.yml

----
-title: Fix tooltips in mini pipeline graph
-merge_request:
-author:

changelogs/unreleased/27966-branch-ref-switcher-input-filter-broken.yml

----
-title: Display loading indicator when filtering ref switcher dropdown
-merge_request:
-author:

changelogs/unreleased/27987-skipped-pipeline-mr-graph.yml

----
-title: Show pipeline graph in MR widget if there are any stages
-merge_request:
-author:

changelogs/unreleased/27991-success-with-warnings-caret.yml

----
-title: Fix icon colors in merge request widget mini graph
-merge_request:
-author:

changelogs/unreleased/28029-improve-blockquote-formatting-on-emails.yml

----
-title: Improve blockquote formatting in notification emails
-merge_request:
-author:

changelogs/unreleased/28032-tooltips-file-name.yml

----
-title: Adds container to tooltip in order to make it work with overflow:hidden in
-  parent element
-merge_request:
-author:

changelogs/unreleased/28059-add-pagination-to-admin-abuse-reports.yml

----
-title: Restore pagination to admin abuse reports
-merge_request:
-author:

changelogs/unreleased/28458-present-gitlab-version-for-v4-changes-on-docs.yml

+---
+title: Present GitLab version for each V3 to V4 API change on v3_to_v4.md
+merge_request:
+author:

changelogs/unreleased/395-fix-notification-when-group-set-to-watch.yml

----
-title: Fix notifications when set at group level
-merge_request: 6813
-author: Alexandre Maia

changelogs/unreleased/8-15-stable.yml

----
-title: Ensure export files are removed after a namespace is deleted
-merge_request: 
-author: 

changelogs/unreleased/8082-permalink-to-file.yml

----
-title: Add `y` keyboard shortcut to move to file permalink
-merge_request:
-author:

changelogs/unreleased/9-0-api-changes.yml

----
-title: Remove deprecated MR and Issue endpoints and preserve V3 namespace
-merge_request: 8967
-author:

changelogs/unreleased/Add-a-shash-command-for-target-merge-request-branch.yml

----
-title: Adds /target_branch slash command functionality for merge requests
-merge_request:
-author: YarNayar