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

# Conflicts:
#	app/views/clusters/clusters/_sidebar.html.haml
#	lib/gitlab/background_migration/redact_links.rb
#	locale/gitlab.pot

[ci skip]

.gitlab-ci.yml

@@ -1135,7 +1135,6 @@ review:
     - download_gitlab_chart
     - ensure_namespace
     - install_tiller
-    - create_secret
     - install_external_dns
     - deploy
   environment:

app/assets/javascripts/jobs/components/sidebar.vue

 <script>
 import _ from 'underscore';
 import { mapActions, mapState } from 'vuex';
+import { GlLink, GlButton } from '@gitlab-org/gitlab-ui';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
 import { timeIntervalInWords } from '~/lib/utils/datetime_utility';
 import Icon from '~/vue_shared/components/icon.vue';
@@ -21,6 +22,8 @@ export default {
     TriggerBlock,
     StagesDropdown,
     JobsContainer,
+    GlLink,
+    GlButton,
   },
   mixins: [timeagoMixin],
   props: {
@@ -115,7 +118,7 @@ export default {
           <strong class="inline prepend-top-8">
             {{ job.name }}
           </strong>
-          <a
+          <gl-link
             v-if="job.retry_path"
             :class="retryButtonClass"
             :href="job.retry_path"
@@ -123,8 +126,8 @@ export default {
             rel="nofollow"
           >
             {{ __('Retry') }}
-          </a>
-          <a
+          </gl-link>
+          <gl-link
             v-if="job.terminal_path"
             :href="job.terminal_path"
             class="js-terminal-link pull-right btn btn-primary
@@ -133,8 +136,8 @@ export default {
           >
             {{ __('Debug') }}
             <icon name="external-link" />
-          </a>
-          <button
+          </gl-link>
+          <gl-button
             :aria-label="__('Toggle Sidebar')"
             type="button"
             class="btn btn-blank gutter-toggle
@@ -146,20 +149,20 @@ export default {
               data-hidden="true"
               class="fa fa-angle-double-right"
             ></i>
-          </button>
+          </gl-button>
         </div>
         <div
           v-if="job.retry_path || job.new_issue_path"
           class="block retry-link"
         >
-          <a
+          <gl-link
             v-if="job.new_issue_path"
             :href="job.new_issue_path"
             class="js-new-issue btn btn-success btn-inverted"
           >
             {{ __('New issue') }}
-          </a>
-          <a
+          </gl-link>
+          <gl-link
             v-if="job.retry_path"
             :href="job.retry_path"
             class="js-retry-job btn btn-inverted-secondary"
@@ -167,7 +170,7 @@ export default {
             rel="nofollow"
           >
             {{ __('Retry') }}
-          </a>
+          </gl-link>
         </div>
         <div :class="{ block : renderBlock }">
           <p
@@ -177,9 +180,9 @@ export default {
             <span class="build-light-text">
               {{ __('Merge Request:') }}
             </span>
-            <a :href="job.merge_request.path">
+            <gl-link :href="job.merge_request.path">
               !{{ job.merge_request.iid }}
-            </a>
+            </gl-link>
           </p>
 
           <detail-row
@@ -244,14 +247,14 @@ export default {
             v-if="job.cancel_path"
             class="btn-group prepend-top-5"
             role="group">
-            <a
+            <gl-link
               :href="job.cancel_path"
               class="js-cancel-job btn btn-sm btn-default"
               data-method="post"
               rel="nofollow"
             >
               {{ __('Cancel') }}
-            </a>
+            </gl-link>
           </div>
         </div>
 

app/assets/javascripts/jobs/components/trigger_block.vue

 <script>
+import { GlButton } from '@gitlab-org/gitlab-ui';
+
 export default {
+  components: {
+    GlButton,
+  },
   props: {
     trigger: {
       type: Object,
@@ -41,15 +46,14 @@ export default {
     </p>
 
     <p v-if="hasVariables">
-      <button
+      <gl-button
         v-if="!areVariablesVisible"
         type="button"
         class="btn btn-default group js-reveal-variables"
         @click="revealVariables"
       >
         {{ __('Reveal Variables') }}
-      </button>
-
+      </gl-button>
     </p>
 
     <dl

app/assets/javascripts/notes/components/noteable_discussion.vue

@@ -448,7 +448,7 @@ Please check your network connection and try again.`;
                     <div class="discussion-with-resolve-btn">
                       <button
                         type="button"
-                        class="js-vue-discussion-reply btn btn-text-field mr-2 qa-discussion-reply"
+                        class="js-vue-discussion-reply btn btn-text-field mr-sm-2 qa-discussion-reply"
                         title="Add a reply"
                         @click="showReplyForm"
                       >
@@ -457,7 +457,7 @@ Please check your network connection and try again.`;
                       <div v-if="discussion.resolvable">
                         <button
                           type="button"
-                          class="btn btn-default mx-sm-2"
+                          class="btn btn-default mr-sm-2"
                           @click="resolveHandler()"
                         >
                           <i
@@ -470,7 +470,7 @@ Please check your network connection and try again.`;
                       </div>
                       <div
                         v-if="discussion.resolvable"
-                        class="btn-group discussion-actions"
+                        class="btn-group discussion-actions ml-sm-2"
                         role="group"
                       >
                         <div

app/assets/javascripts/pipelines/components/empty_state.vue

 <script>
+import { GlButton } from '@gitlab-org/gitlab-ui';
+
 export default {
   name: 'PipelinesEmptyState',
+  components: {
+    GlButton,
+  },
   props: {
     helpPagePath: {
       type: String,
@@ -41,12 +46,13 @@ export default {
           </p>
 
           <div class="text-center">
-            <a
+            <gl-button
               :href="helpPagePath"
-              class="btn btn-primary js-get-started-pipelines"
+              variant="primary"
+              class="js-get-started-pipelines"
             >
               {{ s__('Pipelines|Get started with Pipelines') }}
-            </a>
+            </gl-button>
           </div>
         </template>
 

app/assets/javascripts/pipelines/components/nav_controls.vue

 <script>
+import { GlLink, GlButton } from '@gitlab-org/gitlab-ui';
 import LoadingButton from '../../vue_shared/components/loading_button.vue';
 
 export default {
   name: 'PipelineNavControls',
   components: {
     LoadingButton,
+    GlLink,
+    GlButton,
   },
   props: {
     newPipelinePath: {
@@ -40,28 +43,29 @@ export default {
 </script>
 <template>
   <div class="nav-controls">
-    <a
+    <gl-button
       v-if="newPipelinePath"
       :href="newPipelinePath"
-      class="btn btn-success js-run-pipeline"
+      variant="success"
+      class="js-run-pipeline"
     >
       {{ s__('Pipelines|Run Pipeline') }}
-    </a>
+    </gl-button>
 
     <loading-button
       v-if="resetCachePath"
       :loading="isResetCacheButtonLoading"
       :label="s__('Pipelines|Clear Runner Caches')"
-      class="btn btn-default js-clear-cache"
+      class="js-clear-cache"
       @click="onClickResetCache"
     />
 
-    <a
+    <gl-button
       v-if="ciLintPath"
       :href="ciLintPath"
-      class="btn btn-default js-ci-lint"
+      class="js-ci-lint"
     >
       {{ s__('Pipelines|CI Lint') }}
-    </a>
+    </gl-button>
   </div>
 </template>

app/assets/javascripts/pipelines/components/pipeline_url.vue

 <script>
-import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
-import tooltip from '../../vue_shared/directives/tooltip';
-import popover from '../../vue_shared/directives/popover';
+import { GlLink, GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
+import popover from '~/vue_shared/directives/popover';
 
 export default {
   components: {
-    userAvatarLink,
+    UserAvatarLink,
+    GlLink,
   },
   directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
     popover,
   },
   props: {
@@ -47,11 +48,12 @@ export default {
 </script>
 <template>
   <div class="table-section section-15 d-none d-sm-none d-md-block pipeline-tags">
-    <a
+    <gl-link
       :href="pipeline.path"
-      class="js-pipeline-url-link">
+      class="js-pipeline-url-link"
+    >
       <span class="pipeline-id">#{{ pipeline.id }}</span>
-    </a>
+    </gl-link>
     <span>by</span>
     <user-avatar-link
       v-if="user"
@@ -68,36 +70,41 @@ export default {
     <div class="label-container">
       <span
         v-if="pipeline.flags.latest"
-        v-tooltip
+        v-gl-tooltip
         class="js-pipeline-url-latest badge badge-success"
-        title="Latest pipeline for this branch">
+        title="Latest pipeline for this branch"
+      >
         latest
       </span>
       <span
         v-if="pipeline.flags.yaml_errors"
-        v-tooltip
+        v-gl-tooltip
         :title="pipeline.yaml_errors"
-        class="js-pipeline-url-yaml badge badge-danger">
+        class="js-pipeline-url-yaml badge badge-danger"
+      >
         yaml invalid
       </span>
       <span
         v-if="pipeline.flags.failure_reason"
-        v-tooltip
+        v-gl-tooltip
         :title="pipeline.failure_reason"
-        class="js-pipeline-url-failure badge badge-danger">
+        class="js-pipeline-url-failure badge badge-danger"
+      >
         error
       </span>
-      <a
+      <gl-link
         v-if="pipeline.flags.auto_devops"
         v-popover="popoverOptions"
         tabindex="0"
         class="js-pipeline-url-autodevops badge badge-info autodevops-badge"
-        role="button">
+        role="button"
+      >
         Auto DevOps
-      </a>
+      </gl-link>
       <span
         v-if="pipeline.flags.stuck"
-        class="js-pipeline-url-stuck badge badge-warning">
+        class="js-pipeline-url-stuck badge badge-warning"
+      >
         stuck
       </span>
     </div>

app/assets/javascripts/pipelines/components/pipelines_actions.vue

 <script>
+import { GlButton, GlTooltipDirective, GlLoadingIcon } from '@gitlab-org/gitlab-ui';
 import { s__, sprintf } from '~/locale';
+import GlCountdown from '~/vue_shared/components/gl_countdown.vue';
 import eventHub from '../event_hub';
 import Icon from '../../vue_shared/components/icon.vue';
-import tooltip from '../../vue_shared/directives/tooltip';
-import GlCountdown from '~/vue_shared/components/gl_countdown.vue';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
 
 export default {
   directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
   },
   components: {
     Icon,
     GlCountdown,
+    GlButton,
     GlLoadingIcon,
   },
   props: {
@@ -59,14 +59,12 @@ export default {
 </script>
 <template>
   <div class="btn-group">
-    <button
-      v-tooltip
+    <gl-button
+      v-gl-tooltip
       :disabled="isLoading"
-      type="button"
       class="dropdown-new btn btn-default js-pipeline-dropdown-manual-actions"
       title="Manual job"
       data-toggle="dropdown"
-      data-placement="top"
       aria-label="Manual job"
     >
       <icon
@@ -78,17 +76,16 @@ export default {
         aria-hidden="true">
       </i>
       <gl-loading-icon v-if="isLoading" />
-    </button>
+    </gl-button>
 
     <ul class="dropdown-menu dropdown-menu-right">
       <li
         v-for="action in actions"
         :key="action.path"
       >
-        <button
+        <gl-button
           :class="{ disabled: isActionDisabled(action) }"
           :disabled="isActionDisabled(action)"
-          type="button"
           class="js-pipeline-action-link no-btn btn"
           @click="onClickAction(action)"
         >
@@ -100,7 +97,7 @@ export default {
             <icon name="clock" />
             <gl-countdown :end-date-string="action.scheduled_at" />
           </span>
-        </button>
+        </gl-button>
       </li>
     </ul>
   </div>

app/assets/javascripts/pipelines/components/pipelines_artifacts.vue

 <script>
-import tooltip from '../../vue_shared/directives/tooltip';
-import Icon from '../../vue_shared/components/icon.vue';
+import { GlLink, GlButton, GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import Icon from '~/vue_shared/components/icon.vue';
 
 export default {
   directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
   },
   components: {
     Icon,
+    GlLink,
+    GlButton,
   },
   props: {
     artifacts: {
@@ -22,11 +24,10 @@ export default {
     class="btn-group"
     role="group"
   >
-    <button
-      v-tooltip
-      class="dropdown-toggle btn btn-default build-artifacts js-pipeline-dropdown-download"
+    <gl-button
+      v-gl-tooltip
+      class="dropdown-toggle build-artifacts js-pipeline-dropdown-download"
       title="Artifacts"
-      data-placement="top"
       data-toggle="dropdown"
       aria-label="Artifacts"
     >
@@ -36,18 +37,19 @@ export default {
         aria-hidden="true"
       >
       </i>
-    </button>
+    </gl-button>
     <ul class="dropdown-menu dropdown-menu-right">
       <li
         v-for="(artifact, i) in artifacts"
-        :key="i">
-        <a
+        :key="i"
+      >
+        <gl-link
           :href="artifact.path"
           rel="nofollow"
           download
         >
           Download {{ artifact.name }} artifacts
-        </a>
+        </gl-link>
       </li>
     </ul>
   </div>

app/assets/javascripts/vue_shared/components/clipboard_button.vue

@@ -12,20 +12,18 @@
  *    css-class="btn-transparent"
  * />
  */
-import tooltip from '../directives/tooltip';
+import { GlButton, GlTooltipDirective } from '@gitlab-org/gitlab-ui';
 import Icon from '../components/icon.vue';
 
 export default {
   name: 'ClipboardButton',
-
   directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
   },
-
   components: {
+    GlButton,
     Icon,
   },
-
   props: {
     text: {
       type: String,
@@ -68,16 +66,12 @@ export default {
 </script>
 
 <template>
-  <button
-    v-tooltip
+  <gl-button
+    v-gl-tooltip="{ placement: tooltipPlacement, container: tooltipContainer }"
     :class="cssClass"
     :title="title"
     :data-clipboard-text="clipboardText"
-    :data-container="tooltipContainer"
-    :data-placement="tooltipPlacement"
-    type="button"
-    class="btn"
   >
     <icon name="duplicate" />
-  </button>
+  </gl-button>
 </template>

app/assets/stylesheets/pages/notes.scss

@@ -595,7 +595,6 @@ $note-form-margin-left: 70px;
 
 .discussion-actions {
   float: right;
-  margin-left: 10px;
   color: $gray-darkest;
 
   @include media-breakpoint-down(xs) {

app/assets/stylesheets/pages/pages.scss

 .pages-domain-list {
   &-item {
-    position: relative;
-    display: flex;
     align-items: center;
 
     .domain-status {
@@ -44,8 +42,9 @@
   }
 
   :first-child {
-    border-bottom-left-radius: $border-radius-default;
-    border-top-left-radius: $border-radius-default;
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+    line-height: $gl-line-height;
   }
 
   :not(:first-child) {

app/models/clusters/applications/knative.rb

@@ -44,7 +44,7 @@ module Clusters
       private
 
       def install_script
-        ["/usr/bin/kubectl apply -f #{ISTIO_CRDS} >/dev/null"]
+        ["/usr/bin/kubectl apply -f #{ISTIO_CRDS}"]
       end
     end
   end

app/services/commits/change_service.rb

@@ -24,8 +24,12 @@ module Commits
         start_project: @start_project,
         start_branch_name: @start_branch)
     rescue Gitlab::Git::Repository::CreateTreeError
-      error_msg = "Sorry, we cannot #{action.to_s.dasherize} this #{@commit.change_type_title(current_user)} automatically.
-                   This #{@commit.change_type_title(current_user)} may already have been #{action.to_s.dasherize}ed, or a more recent commit may have updated some of its content."
+      act = action.to_s.dasherize
+      type = @commit.change_type_title(current_user)
+
+      error_msg = "Sorry, we cannot #{act} this #{type} automatically. " \
+        "This #{type} may already have been #{act}ed, or a more recent " \
+        "commit may have updated some of its content."
       raise ChangeError, error_msg
     end
   end

app/views/clusters/clusters/_sidebar.html.haml

+<<<<<<< HEAD
 - autodevops_help_url = help_page_path('topics/autodevops/index.md', anchor: 'using-multiple-kubernetes-clusters-premium')
 - help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe
 - help_link_end = '</a>'.html_safe
+=======
+>>>>>>> upstream/master
 %h4.prepend-top-0
   = s_('ClusterIntegration|Add a Kubernetes cluster integration')
 %p
   = clusterable.sidebar_text
 %p
   = clusterable.learn_more_link
+<<<<<<< HEAD
 %p
   = s_('ClusterIntegration|If you are setting up multiple clusters and are using Auto DevOps, %{help_link_start}read this first%{help_link_end}.').html_safe % { help_link_start: help_link_start % { url: autodevops_help_url }, help_link_end: help_link_end }
+=======
+>>>>>>> upstream/master

app/views/projects/pages/_https_only.html.haml

 = form_for @project, url: namespace_project_pages_path(@project.namespace.becomes(Namespace), @project), html: { class: 'inline', title: pages_https_only_title } do |f|
-  = f.check_box :pages_https_only, class: 'float-left', disabled: pages_https_only_disabled?
-
-  .prepend-left-20
+  .form-group
+    .form-check
+      = f.check_box :pages_https_only, class: 'form-check-input', disabled: pages_https_only_disabled?
       = f.label :pages_https_only, class: pages_https_only_label_class do
         %strong Force domains with SSL certificates to use HTTPS
 

app/views/projects/pages/_list.html.haml

@@ -4,9 +4,9 @@
   .card
     .card-header
       Domains (#{@domains.count})
-    %ul.content-list.pages-domain-list{ class: ("has-verification-status" if verification_enabled) }
+    %ul.list-group.list-group-flush.pages-domain-list{ class: ("has-verification-status" if verification_enabled) }
       - @domains.each do |domain|
-        %li.pages-domain-list-item.unstyled
+        %li.pages-domain-list-item.list-group-item.d-flex.justify-content-between
           - if verification_enabled
             - tooltip, status = domain.unverified? ? [_('Unverified'), 'failed'] : [_('Verified'), 'success']
             .domain-status.ci-status-icon.has-tooltip{ class: "ci-status-icon-#{status}", title: tooltip }
@@ -16,7 +16,7 @@
               = domain.url
               = icon('external-link')
             - if domain.subject
-              %p
+              %div
                 %span.badge.badge-gray Certificate: #{domain.subject}
                 - if domain.expired?
                   %span.badge.badge-danger Expired
@@ -24,6 +24,6 @@
             = link_to 'Details', project_pages_domain_path(@project, domain), class: "btn btn-sm btn-grouped"
             = link_to 'Remove', project_pages_domain_path(@project, domain), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped"
         - if verification_enabled && domain.unverified?
-          %li.warning-row
+          %li.list-group-item.bs-callout-warning
             #{domain.domain} is not verified. To learn how to verify ownership, visit your
             #{link_to 'domain details', project_pages_domain_path(@project, domain)}.

changelogs/unreleased/48475-gitlab-pages-settings-regressions.yml

+---
+title: Fixing regression issues on pages settings and details
+merge_request: 22821
+author:
+type: fixed

changelogs/unreleased/51259-ci-cd-gitlab-ui-1.yml

+---
+title: Uses new gitlab-ui components in Jobs and Pipelines components
+merge_request:
+author:
+type: other

changelogs/unreleased/frozen-string-lib-gitlab-more.yml

+---
+title: Enable even more frozen string in lib/gitlab/**/*.rb
+merge_request:
+author: gfyoung
+type: performance

changelogs/unreleased/rs-cherry-pick-api.yml

+---
+title: Resolve possible cherry pick API race condition
+merge_request:
+author:
+type: fixed

changelogs/unreleased/rs-revert-api.yml

+---
+title: Add revert to commits API
+merge_request: 22919
+author:
+type: added

doc/administration/custom_hooks.md

@@ -62,7 +62,7 @@ installations, this can be set in `gitlab-shell/config.yml`.
 
 The hooks are searched and executed in this order:
 
-1. `<project>.git/hooks/` - symlink to `gitlab-shell/hooks` global dir
+1. `gitlab-shell/hooks` directory as known to Gitaly
 1. `<project>.git/hooks/<hook_name>` -  executed by `git` itself, this is `gitlab-shell/hooks/<hook_name>`
 1. `<project>.git/custom_hooks/<hook_name>` - per project hook (this is already existing behavior)
 1. `<project>.git/custom_hooks/<hook_name>.d/*` - per project hooks

doc/api/commits.md

@@ -288,6 +288,47 @@ Example response:
 }
 ```
 
+## Revert a commit
+
+> [Introduced][ce-22919] in GitLab 11.6.
+
+Reverts a commit in a given branch.
+
+```
+POST /projects/:id/repository/commits/:sha/revert
+```
+
+Parameters:
+
+| Attribute | Type           | Required | Description                                                                     |
+| --------- | ----           | -------- | -----------                                                                     |
+| `id`      | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
+| `sha`     | string         | yes      | Commit SHA to revert                                                            |
+| `branch`  | string         | yes      | Target branch name                                                              |
+
+```bash
+curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form "branch=master" "https://gitlab.example.com/api/v4/projects/5/repository/commits/a738f717824ff53aebad8b090c1b79a14f2bd9e8/revert"
+```
+
+Example response:
+
+```json
+{
+  "id":"8b090c1b79a14f2bd9e8a738f717824ff53aebad",
+  "short_id": "8b090c1b",
+  "title":"Revert \"Feature added\"",
+  "created_at":"2018-11-08T15:55:26.000Z",
+  "parent_ids":["a738f717824ff53aebad8b090c1b79a14f2bd9e8"],
+  "message":"Revert \"Feature added\"\n\nThis reverts commit a738f717824ff53aebad8b090c1b79a14f2bd9e8",
+  "author_name":"Administrator",
+  "author_email":"admin@example.com",
+  "authored_date":"2018-11-08T15:55:26.000Z",
+  "committer_name":"Administrator",
+  "committer_email":"admin@example.com",
+  "committed_date":"2018-11-08T15:55:26.000Z"
+}
+```
+
 ## Get the diff of a commit
 
 Get the diff of a commit in a project.
@@ -619,3 +660,4 @@ Example response:
 [ce-8047]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8047
 [ce-15026]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15026
 [ce-18004]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18004
+[ce-22919]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22919

lib/api/commits.rb

@@ -194,11 +194,47 @@ module API
           branch_name: params[:branch]
         }
 
-        result = ::Commits::CherryPickService.new(user_project, current_user, commit_params).execute
+        result = ::Commits::CherryPickService
+          .new(user_project, current_user, commit_params)
+          .execute
 
         if result[:status] == :success
-          branch = find_branch!(params[:branch])
-          present user_project.repository.commit(branch.dereferenced_target), with: Entities::Commit
+          present user_project.repository.commit(result[:result]),
+            with: Entities::Commit
+        else
+          render_api_error!(result[:message], 400)
+        end
+      end
+
+      desc 'Revert a commit in a branch' do
+        detail 'This feature was introduced in GitLab 11.6'
+        success Entities::Commit
+      end
+      params do
+        requires :sha, type: String, desc: 'Commit SHA to revert'
+        requires :branch, type: String, desc: 'Target branch name', allow_blank: false
+      end
+      post ':id/repository/commits/:sha/revert', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do
+        authorize_push_to_branch!(params[:branch])
+
+        commit = user_project.commit(params[:sha])
+        not_found!('Commit') unless commit
+
+        find_branch!(params[:branch])
+
+        commit_params = {
+          commit: commit,
+          start_branch: params[:branch],
+          branch_name: params[:branch]
+        }
+
+        result = ::Commits::RevertService
+          .new(user_project, current_user, commit_params)
+          .execute
+
+        if result[:status] == :success
+          present user_project.repository.commit(result[:result]),
+            with: Entities::Commit
         else
           render_api_error!(result[:message], 400)
         end

lib/gitlab/background_migration/redact_links.rb

@@ -6,8 +6,11 @@ require_relative 'redact_links/redactable'
 module Gitlab
   module BackgroundMigration
     class RedactLinks
+<<<<<<< HEAD
       prepend EE::Gitlab::BackgroundMigration::RedactLinks
 
+=======
+>>>>>>> upstream/master
       class Note < ActiveRecord::Base
         include EachBatch
         include ::Gitlab::BackgroundMigration::RedactLinks::Redactable

lib/gitlab/conflict/file.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Conflict
     class File

lib/gitlab/conflict/file_collection.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Conflict
     class FileCollection

lib/gitlab/cross_project_access/check_collection.rb

+# frozen_string_literal: true
+
 module Gitlab
   class CrossProjectAccess
     class CheckCollection

lib/gitlab/cross_project_access/check_info.rb

+# frozen_string_literal: true
+
 module Gitlab
   class CrossProjectAccess
     class CheckInfo

lib/gitlab/cross_project_access/class_methods.rb

+# frozen_string_literal: true
+
 module Gitlab
   class CrossProjectAccess
     module ClassMethods

lib/gitlab/cycle_analytics/base_event_fetcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class BaseEventFetcher

lib/gitlab/cycle_analytics/base_query.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     module BaseQuery

lib/gitlab/cycle_analytics/base_stage.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class BaseStage

lib/gitlab/cycle_analytics/code_event_fetcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class CodeEventFetcher < BaseEventFetcher

lib/gitlab/cycle_analytics/code_stage.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class CodeStage < BaseStage

lib/gitlab/cycle_analytics/event_fetcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     module EventFetcher

lib/gitlab/cycle_analytics/issue_event_fetcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class IssueEventFetcher < BaseEventFetcher

lib/gitlab/cycle_analytics/issue_stage.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class IssueStage < BaseStage

lib/gitlab/cycle_analytics/metrics_tables.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     module MetricsTables

lib/gitlab/cycle_analytics/permissions.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class Permissions

lib/gitlab/cycle_analytics/plan_event_fetcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class PlanEventFetcher < BaseEventFetcher

lib/gitlab/cycle_analytics/plan_stage.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class PlanStage < BaseStage

lib/gitlab/cycle_analytics/production_event_fetcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class ProductionEventFetcher < IssueEventFetcher

lib/gitlab/cycle_analytics/production_helper.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     module ProductionHelper

lib/gitlab/cycle_analytics/production_stage.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class ProductionStage < BaseStage

lib/gitlab/cycle_analytics/review_event_fetcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class ReviewEventFetcher < BaseEventFetcher

lib/gitlab/cycle_analytics/review_stage.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class ReviewStage < BaseStage

lib/gitlab/cycle_analytics/stage.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     module Stage

lib/gitlab/cycle_analytics/stage_summary.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class StageSummary

lib/gitlab/cycle_analytics/staging_event_fetcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class StagingEventFetcher < BaseEventFetcher

lib/gitlab/cycle_analytics/staging_stage.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class StagingStage < BaseStage

lib/gitlab/cycle_analytics/summary/base.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     module Summary

lib/gitlab/cycle_analytics/summary/commit.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     module Summary

lib/gitlab/cycle_analytics/summary/deploy.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     module Summary

lib/gitlab/cycle_analytics/summary/issue.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     module Summary

lib/gitlab/cycle_analytics/test_event_fetcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class TestEventFetcher < StagingEventFetcher

lib/gitlab/cycle_analytics/test_stage.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class TestStage < BaseStage

lib/gitlab/cycle_analytics/updater.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class Updater

lib/gitlab/cycle_analytics/usage_data.rb

+# frozen_string_literal: true
+
 module Gitlab
   module CycleAnalytics
     class UsageData

lib/gitlab/data_builder/build.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DataBuilder
     module Build

lib/gitlab/data_builder/note.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DataBuilder
     module Note

lib/gitlab/data_builder/pipeline.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DataBuilder
     module Pipeline

lib/gitlab/data_builder/push.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DataBuilder
     module Push

lib/gitlab/data_builder/repository.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DataBuilder
     module Repository

lib/gitlab/data_builder/wiki_page.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DataBuilder
     module WikiPage

lib/gitlab/database/arel_methods.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Database
     module ArelMethods

lib/gitlab/database/count.rb

+# frozen_string_literal: true
+
 # For large tables, PostgreSQL can take a long time to count rows due to MVCC.
 # We can optimize this by using the reltuples count as described in https://wiki.postgresql.org/wiki/Slow_Counting.
 module Gitlab

lib/gitlab/database/date_time.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Database
     module DateTime

lib/gitlab/database/grant.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Database
     # Model that can be used for querying permissions of a SQL user.

lib/gitlab/database/median.rb

+# frozen_string_literal: true
+
 # https://www.periscopedata.com/blog/medians-in-sql.html
 module Gitlab
   module Database

lib/gitlab/database/migration_helpers.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Database
     module MigrationHelpers

lib/gitlab/database/multi_threaded_migration.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Database
     module MultiThreadedMigration

lib/gitlab/database/read_only_relation.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Database
     # Module that can be injected into a ActiveRecord::Relation to make it

lib/gitlab/database/rename_reserved_paths_migration/v1.rb

+# frozen_string_literal: true
+
 # This module can be included in migrations to make it easier to rename paths
 # of `Namespace` & `Project` models certain paths would become `reserved`.
 #

lib/gitlab/database/rename_reserved_paths_migration/v1/migration_classes.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Database
     module RenameReservedPathsMigration

lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Database
     module RenameReservedPathsMigration

lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Database
     module RenameReservedPathsMigration

lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Database
     module RenameReservedPathsMigration

lib/gitlab/database/sha_attribute.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Database
     BINARY_TYPE =

lib/gitlab/dependency_linker/base_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class BaseLinker

lib/gitlab/dependency_linker/cartfile_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class CartfileLinker < MethodLinker

lib/gitlab/dependency_linker/cocoapods.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     module Cocoapods

lib/gitlab/dependency_linker/composer_json_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class ComposerJsonLinker < PackageJsonLinker

lib/gitlab/dependency_linker/gemfile_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class GemfileLinker < MethodLinker

lib/gitlab/dependency_linker/gemspec_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class GemspecLinker < MethodLinker

lib/gitlab/dependency_linker/godeps_json_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class GodepsJsonLinker < JsonLinker

lib/gitlab/dependency_linker/json_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class JsonLinker < BaseLinker

lib/gitlab/dependency_linker/method_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class MethodLinker < BaseLinker

lib/gitlab/dependency_linker/package_json_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class PackageJsonLinker < JsonLinker

lib/gitlab/dependency_linker/podfile_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class PodfileLinker < GemfileLinker

lib/gitlab/dependency_linker/podspec_json_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class PodspecJsonLinker < JsonLinker

lib/gitlab/dependency_linker/podspec_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class PodspecLinker < MethodLinker

lib/gitlab/dependency_linker/requirements_txt_linker.rb

+# frozen_string_literal: true
+
 module Gitlab
   module DependencyLinker
     class RequirementsTxtLinker < BaseLinker

lib/gitlab/diff/diff_refs.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Diff
     class DiffRefs

lib/gitlab/diff/file.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Diff
     class File

lib/gitlab/diff/file_collection/base.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Diff
     module FileCollection

lib/gitlab/diff/file_collection/commit.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Diff
     module FileCollection

lib/gitlab/diff/file_collection/compare.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Diff
     module FileCollection

lib/gitlab/diff/file_collection/merge_request_diff.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Diff
     module FileCollection