Fix CE -> EE merge conflicts

app/assets/javascripts/boards/services/board_service.js.es6

-<<<<<<< HEAD
 /* eslint-disable space-before-function-paren, comma-dangle, no-param-reassign, camelcase, max-len, no-unused-vars, no-else-return */
-=======
-/* eslint-disable space-before-function-paren, comma-dangle, no-param-reassign, camelcase, max-len, no-unused-vars */
->>>>>>> ce/master
 /* global Vue */
 
 class BoardService {

app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js.es6

-<<<<<<< HEAD
 /* eslint-disable arrow-parens, no-param-reassign, object-shorthand, no-else-return, comma-dangle, no-underscore-dangle, no-continue, no-restricted-syntax, guard-for-in, no-new, class-methods-use-this, consistent-return, max-len */
 /* global Flash */
 
@@ -11,12 +10,6 @@
     USER: 'user',
     GROUP: 'group'
   };
-=======
-/* eslint-disable arrow-parens, no-param-reassign, object-shorthand, no-else-return, comma-dangle, max-len */
-
-(global => {
-  global.gl = global.gl || {};
->>>>>>> ce/master
 
   gl.ProtectedBranchAccessDropdown = class {
     constructor(options) {
@@ -199,7 +192,6 @@
 
       this.items.push(itemToAdd);
     }
-<<<<<<< HEAD
 
     removeSelectedItem(itemToDelete) {
       let index = -1;
@@ -450,7 +442,5 @@
     roleRowHtml(role, isActive) {
       return `<li><a href='#' class='${isActive ? 'is-active' : ''} item-${role.type}'>${role.text}</a></li>`;
     }
-=======
->>>>>>> ce/master
   };
 })(window);

app/assets/javascripts/protected_branches/protected_branch_create.js.es6

-<<<<<<< HEAD
 /* eslint-disable no-new, arrow-parens, no-param-reassign, comma-dangle, guard-for-in, no-restricted-syntax, max-len */
-=======
-/* eslint-disable no-new, arrow-parens, no-param-reassign, comma-dangle, max-len */
->>>>>>> ce/master
 /* global ProtectedBranchDropdown */
 /* global Flash */
 
 (global => {
   global.gl = global.gl || {};
-<<<<<<< HEAD
 
   const ACCESS_LEVELS = {
     MERGE: 'merge_access_levels',
@@ -20,8 +15,6 @@
     USER: 'user',
     GROUP: 'group'
   };
-=======
->>>>>>> ce/master
 
   gl.ProtectedBranchCreate = class {
     constructor() {
@@ -67,7 +60,6 @@
 
     // Enable submit button after selecting an option
     onSelect() {
-<<<<<<< HEAD
       const $allowedToMerge = this[`${ACCESS_LEVELS.MERGE}_dropdown`].getSelectedItems();
       const $allowedToPush = this[`${ACCESS_LEVELS.PUSH}_dropdown`].getSelectedItems();
       const toggle = !(this.$wrap.find('input[name="protected_branch[name]"]').val() && $allowedToMerge.length && $allowedToPush.length);
@@ -104,19 +96,12 @@
             });
           }
         }
-=======
-      // Enable submit button
-      const $branchInput = this.$wrap.find('input[name="protected_branch[name]"]');
-      const $allowedToMergeInput = this.$wrap.find('input[name="protected_branch[merge_access_levels_attributes][0][access_level]"]');
-      const $allowedToPushInput = this.$wrap.find('input[name="protected_branch[push_access_levels_attributes][0][access_level]"]');
->>>>>>> ce/master
 
         formData.protected_branch[`${ACCESS_LEVELS[ACCESS_LEVEL]}_attributes`] = levelAttributes;
       }
 
       return formData;
     }
-<<<<<<< HEAD
 
     onFormSubmit(e) {
       e.preventDefault();
@@ -133,7 +118,5 @@
         new Flash('Failed to protect the branch');
       });
     }
-=======
->>>>>>> ce/master
   };
 })(window);

app/assets/javascripts/protected_branches/protected_branch_edit.js.es6

-<<<<<<< HEAD
 /* eslint-disable no-new, arrow-parens, no-param-reassign, comma-dangle, dot-notation, no-unused-vars, no-restricted-syntax, guard-for-in, max-len */
-=======
-/* eslint-disable no-new, arrow-parens, no-param-reassign, comma-dangle, max-len */
->>>>>>> ce/master
 /* global Flash */
 
 (global => {
   global.gl = global.gl || {};
-<<<<<<< HEAD
 
   const ACCESS_LEVELS = {
     MERGE: 'merge_access_levels',
@@ -19,8 +14,6 @@
     USER: 'user',
     GROUP: 'group'
   };
-=======
->>>>>>> ce/master
 
   gl.ProtectedBranchEdit = class {
     constructor(options) {
@@ -103,7 +96,6 @@
         }
       });
     }
-<<<<<<< HEAD
 
     setSelectedItemsToDropdown(items = [], dropdownName) {
       const itemsToAdd = [];
@@ -148,7 +140,5 @@
 
       this[dropdownName].setSelectedItems(itemsToAdd);
     }
-=======
->>>>>>> ce/master
   };
 })(window);

app/controllers/projects/merge_requests_controller.rb

@@ -366,13 +366,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     end
   end
 
-<<<<<<< HEAD
   def rebase
     return access_denied! unless @merge_request.can_be_merged_by?(current_user)
     return render_404 unless @merge_request.approved?
 
     RebaseWorker.perform_async(@merge_request.id, current_user.id)
-=======
+  end
+
   def merge_widget_refresh
     if merge_request.in_progress_merge_commit_sha || merge_request.state == 'merged'
       @status = :success
@@ -381,7 +381,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     end
 
     render 'merge'
->>>>>>> ce/master
   end
 
   def branch_from

app/models/ci/build.rb

@@ -2,11 +2,8 @@ module Ci
   class Build < CommitStatus
     include TokenAuthenticatable
     include AfterCommitQueue
-<<<<<<< HEAD
-    prepend EE::Build
-=======
     include Presentable
->>>>>>> ce/master
+    prepend EE::Build
 
     belongs_to :runner
     belongs_to :trigger_request

app/services/issuable_base_service.rb

@@ -41,11 +41,7 @@ class IssuableBaseService < BaseService
   end
 
   def create_time_spent_note(issuable)
-<<<<<<< HEAD
     SystemNoteService.change_time_spent(issuable, issuable.project, issuable.time_spent_user)
-=======
-    SystemNoteService.change_time_spent(issuable, issuable.project, current_user)
->>>>>>> ce/master
   end
 
   def filter_params(issuable)

app/services/todo_service.rb

@@ -261,17 +261,11 @@ class TodoService
     create_todos(mentioned_users, attributes)
   end
 
-<<<<<<< HEAD
   def create_approval_required_todos(merge_request, approvers, author)
     attributes = attributes_for_todo(merge_request.project, merge_request, author, Todo::APPROVAL_REQUIRED)
     create_todos(approvers.map(&:user), attributes)
   end
 
-  def create_build_failed_todo(merge_request)
-    author = merge_request.author
-    attributes = attributes_for_todo(merge_request.project, merge_request, author, Todo::BUILD_FAILED)
-    create_todos(author, attributes)
-=======
   def create_build_failed_todo(merge_request, todo_author)
     attributes = attributes_for_todo(merge_request.project, merge_request, todo_author, Todo::BUILD_FAILED)
     create_todos(todo_author, attributes)
@@ -280,7 +274,6 @@ class TodoService
   def create_unmergeable_todo(merge_request, merge_user)
     attributes = attributes_for_todo(merge_request.project, merge_request, merge_user, Todo::UNMERGEABLE)
     create_todos(merge_user, attributes)
->>>>>>> ce/master
   end
 
   def attributes_for_target(target)

app/views/projects/edit.html.haml

@@ -21,7 +21,6 @@
             .form-group
               = f.label :default_branch, "Default Branch", class: 'label-light'
               = f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'})
-<<<<<<< HEAD
         .form-group.project-visibility-level-holder
           = f.label :visibility_level, class: 'label-light' do
             Visibility Level
@@ -46,8 +45,6 @@
         .form-group
           = render 'shared/allow_request_access', form: f
 
-=======
->>>>>>> ce/master
         .form-group
           = f.label :tag_list, "Tags", class: 'label-light'
           = f.text_field :tag_list, value: @project.tag_list.to_s, maxlength: 2000, class: "form-control"

config/brakeman.ignore

+{
+  "ignored_warnings": [
+    {
+      "warning_type": "Cross-Site Request Forgery",
+      "warning_code": 7,
+      "fingerprint": "dc562678129557cdb8b187217da304044547a3605f05fe678093dcb4b4d8bbe4",
+      "message": "'protect_from_forgery' should be called in Oauth::GeoAuthController",
+      "file": "app/controllers/oauth/geo_auth_controller.rb",
+      "line": 1,
+      "link": "http://brakemanscanner.org/docs/warning_types/cross-site_request_forgery/",
+      "code": null,
+      "render_path": null,
+      "location": {
+        "type": "controller",
+        "controller": "Oauth::GeoAuthController"
+      },
+      "user_input": null,
+      "confidence": "High",
+      "note": ""
+    }
+  ],
+  "updated": "2017-01-20 02:06:54 +0000",
+  "brakeman_version": "3.4.1"
+}

doc/api/merge_requests.md

@@ -1138,10 +1138,6 @@ Example response:
   }]
 }
 ```
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
 ## Set a time estimate for a merge request
 
 Sets an estimated time of work for this merge request.

doc/workflow/README.md

@@ -24,10 +24,6 @@
 - [Sharing a project with a group](share_with_group.md)
 - [Share projects with other groups](share_projects_with_other_groups.md)
 - [Time tracking](time_tracking.md)
-<<<<<<< HEAD
-- [Two-factor Authentication (2FA)](two_factor_authentication.md)
-=======
->>>>>>> ce/master
 - [Web Editor](../user/project/repository/web_editor.md)
 - [Releases](releases.md)
 - [Milestones](milestones.md)

doc/workflow/time_tracking.md

 # Time Tracking
 
-<<<<<<< HEAD
 > Introduced in GitLab 8.14 in beta.
-=======
-> Introduced in GitLab 8.14.
->>>>>>> ce/master
 
 Time Tracking allows you to track estimates and time spent on issues and merge
 requests within GitLab.
@@ -25,11 +21,7 @@ below.
 
 ## How to enter data
 
-<<<<<<< HEAD
 Time Tracking uses two slash [commands] that are available with this new
-=======
-Time Tracking uses two [slash commands] that GitLab introduced with this new
->>>>>>> ce/master
 feature: `/spend` and `/estimate`.
 
 Slash commands can be used in the body of an issue or a merge request, but also
@@ -45,22 +37,14 @@ Adding time entries (time spent or estimates) is limited to project members.
 
 To enter an estimate, write `/estimate`, followed by the time. For example, if
 you need to enter an estimate of 3 days, 5 hours and 10 minutes, you would write
-<<<<<<< HEAD
 `/estimate 3d 5h 10m`. Time units that we support are listed at the bottom of
 this help page.
-=======
-`/estimate 3d 5h 10m`.
->>>>>>> ce/master
 
 Every time you enter a new time estimate, any previous time estimates will be
 overridden by this new value. There should only be one valid estimate in an
 issue or a merge request.
 
-<<<<<<< HEAD
 To remove an estimation entirely, use `/remove_estimate `.
-=======
-To remove an estimation entirely, use `/remove_estimation`.
->>>>>>> ce/master
 
 ### Time spent
 
@@ -84,7 +68,6 @@ The following time units are available:
 * hours (h)
 * minutes (m)
 
-<<<<<<< HEAD
 Default conversion rates are
 * 1 week = 5 days,
 * 1 day = 8 hours.
@@ -95,9 +78,3 @@ Other interesting links:
 
 [landing]: https://about.gitlab.com/features/time-tracking
 [commands]: ../user/project/slash_commands.md
-=======
-Default conversion rates are 1w = 5d and 1d = 8h.
-
-[landing]: https://about.gitlab.com/features/time-tracking
-[slash-commands]: ../user/project/slash_commands.md
->>>>>>> ce/master

features/steps/shared/project.rb

@@ -4,15 +4,12 @@ module SharedProject
   # Create a project without caring about what it's called
   step "I own a project" do
     @project = create(:project, :repository, namespace: @user.namespace)
-<<<<<<< HEAD
     @project.team << [@user, :master]
   end
 
   step "I own a project in some group namespace" do
     @group = create(:group, name: 'some group')
     @project = create(:project, namespace: @group)
-=======
->>>>>>> ce/master
     @project.team << [@user, :master]
   end
 
@@ -24,11 +21,7 @@ module SharedProject
   # Create a specific project called "Shop"
   step 'I own project "Shop"' do
     @project = Project.find_by(name: "Shop")
-<<<<<<< HEAD
     @project ||= create(:project, :repository, name: "Shop", namespace: @user.namespace, issues_template: "This issue should contain the following.", merge_requests_template: "This merge request should contain the following.")
-=======
-    @project ||= create(:project, :repository, name: "Shop", namespace: @user.namespace)
->>>>>>> ce/master
     @project.team << [@user, :master]
   end
 

spec/features/issues/user_uses_slash_commands_spec.rb

@@ -126,8 +126,6 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
       end
     end
 
-<<<<<<< HEAD
-=======
     describe 'Issuable time tracking' do
       let(:issue) { create(:issue, project: project) }
 
@@ -154,7 +152,6 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
       end
     end
 
->>>>>>> ce/master
     describe 'toggling the WIP prefix from the title from note' do
       let(:issue) { create(:issue, project: project) }
 

spec/javascripts/issuable_time_tracker_spec.js.es6

@@ -4,11 +4,7 @@
 //= require issuable/time_tracking/components/time_tracker
 
 function initTimeTrackingComponent(opts) {
-<<<<<<< HEAD
-  setFixtures(`
-=======
   fixture.set(`
->>>>>>> ce/master
     <div>
       <div id="mock-container"></div>
     </div>

spec/lib/gitlab/import_export/all_models.yml

@@ -78,12 +78,9 @@ merge_requests:
 - events
 - merge_requests_closing_issues
 - metrics
-<<<<<<< HEAD
 - approvals
 - approvers
 - approver_groups
-=======
->>>>>>> ce/master
 - timelogs
 merge_request_diff:
 - merge_request

spec/requests/api/merge_requests_spec.rb

@@ -731,7 +731,6 @@ describe API::MergeRequests, api: true  do
     end
   end
 
-<<<<<<< HEAD
   describe 'GET :id/merge_requests/:merge_request_id/approvals' do
     it 'retrieves the approval status' do
       approver = create :user
@@ -810,8 +809,6 @@ describe API::MergeRequests, api: true  do
     end
   end
 
-=======
->>>>>>> ce/master
   describe 'Time tracking' do
     let(:issuable) { merge_request }