Resolve conflicts

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

app/assets/javascripts/environments/components/environment.js.es6

@@ -202,14 +202,6 @@ module.exports = Vue.component('environment-component', {
             :store="store"
             :service="service">
           </environment-table>
-<<<<<<< HEAD
-
-          <table-pagination v-if="shouldRenderPagination"
-            :change="changePage"
-            :pageInfo="state.paginationInformation">
-          </table-pagination>
-=======
->>>>>>> ce/master
         </div>
 
         <table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"

app/controllers/projects/notes_controller.rb

@@ -191,12 +191,7 @@ class Projects::NotesController < Projects::ApplicationController
       )
     end
 
-<<<<<<< HEAD
-    attrs[:commands_changes] = note.commands_changes unless attrs[:award]
-
-=======
     attrs[:commands_changes] = note.commands_changes
->>>>>>> ce/master
     attrs
   end
 

app/services/merge_requests/merge_service.rb

@@ -38,7 +38,6 @@ module MergeRequests
       end
     rescue MergeError => e
       log_merge_error(e.message, save_message_on_model: true)
-<<<<<<< HEAD
     end
 
     def hooks_validation_pass?(merge_request)
@@ -60,8 +59,6 @@ module MergeRequests
       end
 
       true
-=======
->>>>>>> ce/master
     end
 
     private

app/views/layouts/header/_default.html.haml

@@ -40,14 +40,12 @@
               %li
                 = link_to new_project_path, title: 'New project', aria: { label: "New project" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                   = icon('plus fw')
-<<<<<<< HEAD
+
             - if Gitlab::Geo.secondary?
               %li
                 = link_to Gitlab::Geo.primary_node.url, title: 'Go to primary node', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                   = icon('globe fw')
 
-=======
->>>>>>> ce/master
             - if Gitlab::Sherlock.enabled?
               %li
                 = link_to sherlock_transactions_path, title: 'Sherlock Transactions',

app/views/layouts/nav/_dashboard.html.haml

@@ -36,8 +36,4 @@
         Snippets
   %li.divider
   %li
-<<<<<<< HEAD
-    = link_to "About GitLab EE", help_path, title: 'About GitLab EE', class: 'about-gitlab'
-=======
-    = link_to "Help", help_path, title: 'About GitLab CE', class: 'about-gitlab'
->>>>>>> ce/master
+    = link_to "Help", help_path, title: 'About GitLab EE', class: 'about-gitlab'

app/views/layouts/nav/_group.html.haml

@@ -21,14 +21,12 @@
           Merge Requests
           - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened', non_archived: true).execute
           %span.badge.count= number_with_delimiter(merge_requests.count)
-<<<<<<< HEAD
-    = nav_link(controller: [:stats]) do
-      = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
-        %span
-          Contribution Analytics
-=======
     = nav_link(path: 'group_members#index') do
       = link_to group_group_members_path(@group), title: 'Members' do
         %span
           Members
->>>>>>> ce/master
+
+    = nav_link(controller: [:stats]) do
+      = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
+        %span
+          Contribution Analytics

doc/api/issues.md

@@ -591,47 +591,6 @@ POST /projects/:id/issues/:issue_id/unsubscribe
 curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/issues/93/unsubscribe
 ```
 
-<<<<<<< HEAD
-Example response:
-
-```json
-{
-  "id": 93,
-  "iid": 12,
-  "project_id": 5,
-  "title": "Incidunt et rerum ea expedita iure quibusdam.",
-  "description": "Et cumque architecto sed aut ipsam.",
-  "state": "opened",
-  "created_at": "2016-04-05T21:41:45.217Z",
-  "updated_at": "2016-04-07T13:02:37.905Z",
-  "labels": [],
-  "milestone": null,
-  "assignee": {
-    "name": "Edwardo Grady",
-    "username": "keyon",
-    "id": 21,
-    "state": "active",
-    "avatar_url": "http://www.gravatar.com/avatar/3e6f06a86cf27fa8b56f3f74f7615987?s=80&d=identicon",
-    "web_url": "https://gitlab.example.com/keyon"
-  },
-  "author": {
-    "name": "Vivian Hermann",
-    "username": "orville",
-    "id": 11,
-    "state": "active",
-    "avatar_url": "http://www.gravatar.com/avatar/5224fd70153710e92fb8bcf79ac29d67?s=80&d=identicon",
-    "web_url": "https://gitlab.example.com/orville"
-  },
-  "subscribed": false,
-  "due_date": null,
-  "web_url": "http://example.com/example/example/issues/12",
-  "confidential": false,
-  "weight": null
-}
-```
-
-=======
->>>>>>> ce/master
 ## Create a todo
 
 Manually creates a todo for the current user on an issue. If

doc/user/project/slash_commands.md

@@ -35,9 +35,6 @@ do.
 | <code>/spend &lt;1h 30m &#124; -1h 5m&gt;</code> | Add or subtract spent time |
 | `/remove_time_spent`       | Remove time spent |
 | `/target_branch <Branch Name>` | Set target branch for current merge request |
-<<<<<<< HEAD
+| `/award :emoji:`  | Toggle award for :emoji: |
 | `/weight <1-9>` | Set the weight of the issue |
 | `/clear_weight` | Clears the issue weight |
-=======
-| `/award :emoji:`  | Toggle award for :emoji: |
->>>>>>> ce/master

lib/api/api.rb

@@ -25,12 +25,9 @@ module API
       mount ::API::V3::Projects
       mount ::API::V3::ProjectSnippets
       mount ::API::V3::Repositories
-<<<<<<< HEAD
-      mount ::API::V3::Settings
-=======
       mount ::API::V3::Runners
       mount ::API::V3::Services
->>>>>>> ce/master
+      mount ::API::V3::Settings
       mount ::API::V3::Subscriptions
       mount ::API::V3::SystemHooks
       mount ::API::V3::Tags

spec/requests/api/users_spec.rb

@@ -888,14 +888,9 @@ describe API::Users, api: true do
 
       expect do
         delete api("/user/keys/#{key.id}", user)
-<<<<<<< HEAD
-      end.to change { user.keys.count }.by(-1)
-      expect(response).to have_http_status(200)
-=======
 
         expect(response).to have_http_status(204)
       end.to change{user.keys.count}.by(-1)
->>>>>>> ce/master
     end
 
     it "returns 404 if key ID not found" do
@@ -1002,14 +997,9 @@ describe API::Users, api: true do
 
       expect do
         delete api("/user/emails/#{email.id}", user)
-<<<<<<< HEAD
-      end.to change { user.emails.count }.by(-1)
-      expect(response).to have_http_status(200)
-=======
 
         expect(response).to have_http_status(204)
       end.to change{user.emails.count}.by(-1)
->>>>>>> ce/master
     end
 
     it "returns 404 if email ID not found" do

spec/services/slash_commands/interpret_service_spec.rb

@@ -267,7 +267,14 @@ describe SlashCommands::InterpretService, services: true do
       end
     end
 
-<<<<<<< HEAD
+    shared_examples 'award command' do
+      it 'toggle award 100 emoji if content containts /award :100:' do
+        _, updates = service.execute(content, issuable)
+
+        expect(updates).to eq(emoji_award: "100")
+      end
+    end
+
     shared_examples 'weight command' do
       it 'populates weight: 5 if content contains /weight 5' do
         _, updates = service.execute(content, issuable)
@@ -282,13 +289,6 @@ describe SlashCommands::InterpretService, services: true do
         _, updates = service.execute(content, issuable)
 
         expect(updates).to eq(weight: nil)
-=======
-    shared_examples 'award command' do
-      it 'toggle award 100 emoji if content containts /award :100:' do
-        _, updates = service.execute(content, issuable)
-
-        expect(updates).to eq(emoji_award: "100")
->>>>>>> ce/master
       end
     end