Fix easy conflicts

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

.gitattributes

-<<<<<<< HEAD
-CHANGELOG merge=union
-CHANGELOG-EE.md merge=union
-=======
 CHANGELOG.md merge=union
->>>>>>> ce/master
+CHANGELOG-EE.md merge=union
 *.js.es6 gitlab-language=javascript

Gemfile.lock

@@ -303,13 +303,9 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
-<<<<<<< HEAD
     gitlab-license (1.0.0)
-    gitlab_git (10.6.7)
-=======
     gitlab-markup (1.5.0)
     gitlab_git (10.6.8)
->>>>>>> ce/master
       activesupport (~> 4.0)
       charlock_holmes (~> 0.7.3)
       github-linguist (~> 4.7.0)
@@ -898,17 +894,11 @@ DEPENDENCIES
   gemnasium-gitlab-service (~> 0.2)
   gemojione (~> 3.0)
   github-linguist (~> 4.7.0)
-<<<<<<< HEAD
-  github-markup (~> 1.4)
   gitlab-elasticsearch-git (~> 1.0.1)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-license (~> 1.0)
-  gitlab_git (~> 10.6.7)
-=======
-  gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-markup (~> 1.5.0)
   gitlab_git (~> 10.6.8)
->>>>>>> ce/master
   gitlab_omniauth-ldap (~> 1.2.1)
   gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.2)

app/assets/javascripts/api.js

@@ -6,16 +6,10 @@
     groupProjectsPath: "/api/:version/groups/:id/projects.json",
     projectsPath: "/api/:version/projects.json?simple=true",
     labelsPath: "/:namespace_path/:project_path/labels",
-<<<<<<< HEAD
-    licensePath: "/api/:version/licenses/:key",
-    gitignorePath: "/api/:version/gitignores/:key",
-    ldapGroupsPath: "/api/:version/ldap/:provider/groups.json",
-    gitlabCiYmlPath: "/api/:version/gitlab_ci_ymls/:key",
-=======
     licensePath: "/api/:version/templates/licenses/:key",
     gitignorePath: "/api/:version/templates/gitignores/:key",
     gitlabCiYmlPath: "/api/:version/templates/gitlab_ci_ymls/:key",
->>>>>>> ce/master
+    ldapGroupsPath: "/api/:version/ldap/:provider/groups.json",
     issuableTemplatePath: "/:namespace_path/:project_path/templates/:type/:key",
     group: function(group_id, callback) {
       var url = Api.buildUrl(Api.groupPath)

app/controllers/projects/merge_requests_controller.rb

@@ -9,14 +9,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
   before_action :module_enabled
   before_action :merge_request, only: [
-<<<<<<< HEAD
-    :edit, :update, :show, :diffs, :commits, :conflicts, :builds, :pipelines, :merge, :merge_check,
-    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues,
-    :approve, :rebase
-=======
     :edit, :update, :show, :diffs, :commits, :conflicts, :conflict_for_path, :builds, :pipelines, :merge, :merge_check,
-    :ci_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues
->>>>>>> ce/master
+    :ci_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues,
+    :approve, :rebase
   ]
   before_action :validates_merge_request, only: [:show, :diffs, :commits, :builds, :pipelines]
   before_action :define_show_vars, only: [:show, :diffs, :commits, :conflicts, :conflict_for_path, :builds, :pipelines]
@@ -445,18 +440,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     render json: response
   end
 
-<<<<<<< HEAD
-  def approve
-    unless @merge_request.can_approve?(current_user)
-      return render_404
-    end
-
-    MergeRequests::ApprovalService.
-      new(project, current_user).
-      execute(@merge_request)
-
-    redirect_to merge_request_path(@merge_request)
-=======
   def ci_environments_status
     environments =
       begin
@@ -479,7 +462,18 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       end
 
     render json: environments
->>>>>>> ce/master
+  end
+
+  def approve
+    unless @merge_request.can_approve?(current_user)
+      return render_404
+    end
+
+    MergeRequests::ApprovalService.
+      new(project, current_user).
+      execute(@merge_request)
+
+    redirect_to merge_request_path(@merge_request)
   end
 
   protected

app/controllers/projects/project_members_controller.rb

@@ -32,12 +32,12 @@ class Projects::ProjectMembersController < Projects::ApplicationController
       current_user: current_user
     )
 
-<<<<<<< HEAD
     members = @project.project_members.where(user_id: params[:user_ids].split(','))
 
     members.each do |member|
       log_audit_event(member, action: :create)
-=======
+    end
+
     if params[:group_ids].present?
       group_ids = params[:group_ids].split(',')
       groups = Group.where(id: group_ids)
@@ -51,7 +51,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
           expires_at: params[:expires_at]
         )
       end
->>>>>>> ce/master
     end
 
     redirect_to namespace_project_project_members_path(@project.namespace, @project)

app/models/project.rb

@@ -64,11 +64,7 @@ class Project < ActiveRecord::Base
 
   has_one :push_rule, dependent: :destroy
   has_one :last_event, -> {order 'events.created_at DESC'}, class_name: 'Event', foreign_key: 'project_id'
-<<<<<<< HEAD
-  has_one :board, dependent: :destroy
-=======
   has_many :boards, before_add: :validate_board_limit, dependent: :destroy
->>>>>>> ce/master
 
   # Project services
   has_many :services

app/services/git_push_service.rb

@@ -67,21 +67,13 @@ class GitPushService < BaseService
   protected
 
   def update_merge_requests
-<<<<<<< HEAD
-    @project.update_merge_requests(params[:oldrev], params[:newrev], params[:ref], current_user)
-    mirror_update = @project.mirror? && @project.repository.up_to_date_with_upstream?(branch_name)
-=======
     UpdateMergeRequestsWorker.perform_async(@project.id, current_user.id, params[:oldrev], params[:newrev], params[:ref])
->>>>>>> ce/master
+    mirror_update = @project.mirror? && @project.repository.up_to_date_with_upstream?(branch_name)
 
     EventCreateService.new.push(@project, current_user, build_push_data)
     @project.execute_hooks(build_push_data.dup, :push_hooks)
     @project.execute_services(build_push_data.dup, :push_hooks)
-<<<<<<< HEAD
-    Ci::CreatePipelineService.new(project, current_user, build_push_data).execute(mirror_update: mirror_update)
-=======
-    Ci::CreatePipelineService.new(@project, current_user, build_push_data).execute
->>>>>>> ce/master
+    Ci::CreatePipelineService.new(@project, current_user, build_push_data).execute(mirror_update: mirror_update)
     ProjectCacheWorker.perform_async(@project.id)
   end
 

app/services/merge_requests/update_service.rb

@@ -15,14 +15,10 @@ module MergeRequests
         params.except!(:target_branch, :force_remove_source_branch)
       end
 
-<<<<<<< HEAD
-      merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch)
-      old_approvers = merge_request.overall_approvers.to_a
-=======
       if params[:force_remove_source_branch].present?
         merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch)
       end
->>>>>>> ce/master
+      old_approvers = merge_request.overall_approvers.to_a
 
       handle_wip_event(merge_request)
       update(merge_request)

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

@@ -100,8 +100,7 @@
         = f.hidden_field :label_ids, multiple: true, value: ''
         .col-sm-10{ class: "#{"col-lg-8" if has_due_date} #{'issuable-form-padding-top' if !has_labels}" }
           .issuable-form-select-holder
-<<<<<<< HEAD
-            = render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false, show_menu_above: 'true' }
+            = render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false, show_menu_above: 'true' }, dropdown_title: "Select label"
 
       - if issuable.respond_to?(:weight)
         .form-group
@@ -111,9 +110,6 @@
             = f.select :weight, issues_weight_options(issuable.weight, edit: true), { include_blank: true },
               { class: 'select2 js-select2', data: { placeholder: "Select weight" }}
 
-=======
-            = render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false, show_menu_above: 'true' }, dropdown_title: "Select label"
->>>>>>> ce/master
     - if has_due_date
       .col-lg-6
         .form-group

config/routes/user.rb

 require 'constraints/user_url_constrainer'
 
-<<<<<<< HEAD
-get '/u/:username', to: redirect('/%{username}'),
-                    constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }
-
 ## EE-specific
 get  'unsubscribes/:email', to: 'unsubscribes#show', as: :unsubscribe
 post 'unsubscribes/:email', to: 'unsubscribes#create'
 ## EE-specific
 
-=======
->>>>>>> ce/master
 devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks,
                                   registrations: :registrations,
                                   passwords: :passwords,

doc/api/README.md

@@ -28,10 +28,7 @@ following locations:
 - [License](license.md)
 - [Merge Requests](merge_requests.md)
 - [Milestones](milestones.md)
-<<<<<<< HEAD
-=======
 - [Open source license templates](templates/licenses.md)
->>>>>>> ce/master
 - [Namespaces](namespaces.md)
 - [Notes](notes.md) (comments)
 - [Notification settings](notification_settings.md)

doc/development/doc_styleguide.md

@@ -95,17 +95,10 @@ merge request.
   someone in the Merge Request
 - When introducing a new document, be careful for the headings to be
   grammatically and syntactically correct. It is advised to mention one or all
-<<<<<<< HEAD
-  of the following GitLab members for a review: `@axil`, `@rspeicher`,
-  `@dblessing`. This is to ensure that no document
-  with wrong heading is going live without an audit, thus preventing dead links
-  and redirection issues when corrected
-=======
   of the following GitLab members for a review: `@axil`, `@rspeicher`, `@marcia`,
   `@SeanPackham`. This is to ensure that no document with wrong heading is going
   live without an audit, thus preventing dead links and redirection issues when
   corrected
->>>>>>> ce/master
 - Leave exactly one newline after a heading
 
 ## Links
@@ -479,4 +472,4 @@ curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --data "domain
 [doc-restart]: ../administration/restart_gitlab.md "GitLab restart documentation"
 [ce-3349]: https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 "Documentation restructure"
 [graffle]: https://gitlab.com/gitlab-org/gitlab-design/blob/d8d39f4a87b90fb9ae89ca12dc565347b4900d5e/production/resources/gitlab-map.graffle
-[gitlab-map]: https://gitlab.com/gitlab-org/gitlab-design/raw/master/production/resources/gitlab-map.png
+[gitlab-map]: https://gitlab.com/gitlab-org/gitlab-design/raw/master/production/resources/gitlab-map.png
\ No newline at end of file

features/steps/groups.rb

@@ -73,12 +73,11 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
       author: current_user
   end
 
-<<<<<<< HEAD
-  Then 'I should be redirected to group page' do
+  step 'I should be redirected to group page' do
     expect(current_path).to eq group_path(Group.last)
   end
 
-  And 'I change group name' do
+  step 'I change group name' do
     page.within '#tab-edit' do
       fill_in 'group_name', with: 'new-name'
       click_button "Save group"
@@ -97,8 +96,6 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
     end
   end
 
-=======
->>>>>>> ce/master
   step 'I change group "Owned" avatar' do
     attach_file(:group_avatar, File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif'))
     click_button "Save group"

features/support/db_cleaner.rb

 require 'database_cleaner'
 
-<<<<<<< HEAD
-DatabaseCleaner.strategy = :truncation, { except: ['licenses'] }
-=======
-DatabaseCleaner[:active_record].strategy = :truncation
->>>>>>> ce/master
+DatabaseCleaner[:active_record].strategy = :truncation, { except: ['licenses'] }
 
 Spinach.hooks.before_scenario do
   DatabaseCleaner.start

lib/api/api.rb

@@ -47,13 +47,9 @@ module API
     mount ::API::Issues
     mount ::API::Keys
     mount ::API::Labels
-<<<<<<< HEAD
-    mount ::API::License
-    mount ::API::LicenseTemplates
     mount ::API::Ldap
     mount ::API::LdapGroupLinks
-=======
->>>>>>> ce/master
+    mount ::API::License
     mount ::API::Lint
     mount ::API::Members
     mount ::API::MergeRequestDiffs
@@ -63,13 +59,9 @@ module API
     mount ::API::Notes
     mount ::API::NotificationSettings
     mount ::API::Pipelines
-    mount ::API::ProjectHooks
-<<<<<<< HEAD
     mount ::API::ProjectGitHook # TODO: Should be removed after 8.11 is released
+    mount ::API::ProjectHooks
     mount ::API::ProjectPushRule
-    mount ::API::ProjectSnippets
-=======
->>>>>>> ce/master
     mount ::API::Projects
     mount ::API::ProjectSnippets
     mount ::API::Repositories

spec/services/merge_requests/refresh_service_spec.rb

@@ -70,13 +70,9 @@ describe MergeRequests::RefreshService, services: true do
 
       it { expect(@merge_request.notes).not_to be_empty }
       it { expect(@merge_request).to be_open }
-<<<<<<< HEAD
       it { expect(@merge_request.approvals).to be_empty }
-      it { expect(@merge_request.merge_when_build_succeeds).to be_falsey}
-=======
       it { expect(@merge_request.merge_when_build_succeeds).to be_falsey }
       it { expect(@merge_request.diff_head_sha).to eq(@newrev) }
->>>>>>> ce/master
       it { expect(@fork_merge_request).to be_open }
       it { expect(@fork_merge_request.notes).to be_empty }
       it { expect(@build_failed_todo).to be_done }