Resolve conflicts

db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 20180718100455) do
-=======
 ActiveRecord::Schema.define(version: 20180722103201) do
->>>>>>> upstream/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

doc/api/users.md

@@ -253,12 +253,8 @@ Parameters:
   "can_create_project": true,
   "two_factor_enabled": true,
   "external": false,
-<<<<<<< HEAD
   "private_profile": false,
   "shared_runners_minutes_limit": 133
-=======
-  "private_profile": false
->>>>>>> upstream/master
 }
 ```
 
@@ -298,12 +294,8 @@ Parameters:
 - `skip_confirmation` (optional) - Skip confirmation - true or false (default)
 - `external` (optional)          - Flags the user as external - true or false(default)
 - `avatar` (optional)            - Image file for user's avatar
-<<<<<<< HEAD
 - `private_profile` (optional)   - User's profile is private - true or false
 - `shared_runners_minutes_limit` (optional) - Pipeline minutes quota for this user
-=======
-- `private_profile (optional)    - User's profile is private - true or false
->>>>>>> upstream/master
 
 ## User modification
 
@@ -335,11 +327,7 @@ Parameters:
 - `external` (optional)         - Flags the user as external - true or false(default)
 - `shared_runners_minutes_limit` (optional) - Pipeline minutes quota for this user
 - `avatar` (optional)           - Image file for user's avatar
-<<<<<<< HEAD
-- `private_profile` (optional)   - User's profile is private - true or false
-=======
-- `private_profile (optional)   - User's profile is private - true or false
->>>>>>> upstream/master
+- `private_profile` (optional)  - User's profile is private - true or false
 
 On password update, user will be forced to change it upon next login.
 Note, at the moment this method does only return a `404` error,

spec/requests/api/users_spec.rb

@@ -638,7 +638,6 @@ describe API::Users do
       expect(user.reload.private_profile).to eq(true)
     end
 
-<<<<<<< HEAD
     # EE
     it "updates shared_runners_minutes_limit" do
       expect do
@@ -650,8 +649,6 @@ describe API::Users do
       expect(json_response['shared_runners_minutes_limit']).to eq(133)
     end
 
-=======
->>>>>>> upstream/master
     it "does not update admin status" do
       put api("/users/#{admin_user.id}", admin), { can_create_group: false }