CE upstream

Unmerged paths: (use "git add/rm ..." as appropriate to mark resolution)

both modified:   Gemfile.lock
both modified:   app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6
both modified:   app/assets/javascripts/merge_request_widget.js.es6
both modified:   app/assets/javascripts/protected_branches/protected_branch_dropdown.js.es6
both modified:   app/assets/javascripts/protected_branches/protected_branch_edit.js.es6
both modified:   app/assets/stylesheets/framework/variables.scss
both added:      app/controllers/concerns/oauth_applications.rb
both modified:   app/controllers/concerns/service_params.rb
both modified:   app/helpers/projects_helper.rb
both modified:   app/helpers/sorting_helper.rb
both modified:   app/models/project.rb
both modified:   app/policies/group_member_policy.rb
both modified:   app/policies/group_policy.rb
both modified:   app/views/projects/merge_requests/widget/_open.html.haml
both modified:   app/views/projects/merge_requests/widget/open/_accept.html.haml
both added:      changelogs/unreleased/25482-fix-api-sudo.yml
both modified:   config/application.rb
both modified:   config/gitlab.yml.example
both modified:   db/schema.rb
both modified:   doc/README.md
deleted by them: features/admin/settings.feature
both modified:   features/steps/shared/paths.rb
both modified:   lib/api/helpers.rb
both modified:   public/500.html
both modified:   public/502.html
both modified:   spec/features/admin/admin_settings_spec.rb
both modified:   spec/javascripts/awards_handler_spec.js
both modified:   spec/lib/gitlab/auth_spec.rb
both modified:   spec/models/project_services/chat_message/pipeline_message_spec.rb
both modified:   spec/requests/api/helpers_spec.rb

mentioned in merge request !966 (closed)

added 1 commit

• c35a1c5f - Fix rubucop offenses

Compare with previous version

added 1 commit

• c9dff064 - Fix bundle exec rake assets:precompile

Compare with previous version

added 2 commits

• 1010005d - Fix eslint offenses
• e37bf8d7 - Fix spec/models/project_spec.rb

Compare with previous version

https://gitlab.com/gitlab-org/gitlab-ee/builds/7568049 is also failing for me:

rspec ./spec/features/groups/members/override_ldap_memberships_spec.rb:22 # Groups > Members > Master/Owner can override LDAP access levels owner can override LDAP access level

  1) Groups > Members > Master/Owner can override LDAP access levels owner can override LDAP access level
     Failure/Error: click_link 'Revert to LDAP group sync settings'

I think the above is failing due to change in gl_dropdown via gitlab-org/gitlab-ce@262fc28a. /cc: @alfredo1

It looks to me https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/974/builds is failing because the group avatar appears to be deleted after each spec run. Does it have something to do with !904 (merged)? /cc: @brodock

Looks like time tracking is also not working properly in https://gitlab.com/gitlab-org/gitlab-ee/builds/7568035. /cc: @fatihacet

added 2 commits

• 1e5c04b9 - Always use fixture_file_upload helper to upload files in tests.
• b0212aa4 - Merge branch 'fix-groups-helper-spec' into 'ce-to-ee'

Compare with previous version

added 1 commit

• 102e9078 - Grapify Jenkins and Jenkins Deprecated Service API

Compare with previous version

@rymai @razer6 Please double check if I missed anything here.

Thanks @stanhu, LGTM!

Fixed misspelling

added 1 commit

• e707ffe6 - Fix typo

Compare with previous version

mentioned in merge request !977 (merged)

mentioned in commit 314c2d51

added 2 commits

• 075fc587 - Check if selected object is valid before passing to calback
• 314c2d51 - Merge branch 'gl-dropdown-fix' into 'ce-to-ee'

Compare with previous version

@rdavila It looks to me that /spend is not working because the backend is not actually saving the logs to the database. I'm not sure how this worked before? This seems to have fixed things:

diff --git a/app/models/concerns/time_trackable.rb b/app/models/concerns/time_trackable.rb
index 6fa2af4..1e80276 100644
--- a/app/models/concerns/time_trackable.rb
+++ b/app/models/concerns/time_trackable.rb
@@ -46,13 +46,15 @@ module TimeTrackable
   private

   def reset_spent_time
-    timelogs.new(time_spent: total_time_spent * -1, user: @time_spent_user)
+    log = timelogs.new(time_spent: total_time_spent * -1, user: @time_spent_user)
+    log.save
   end

   def add_or_subtract_spent_time
     # Exit if time to subtract exceeds the total time spent.
     return if time_spent < 0 && (time_spent.abs > total_time_spent)

-    timelogs.new(time_spent: time_spent, user: @time_spent_user)
+    log = timelogs.new(time_spent: time_spent, user: @time_spent_user)
+    log.save
   end
 end
``

@stan at some point in the service the issuable is saved and it saves the children that were built too.

El El lun, 19 de dic. de 2016 a las 01:23, Stan Hu gitlab@mg.gitlab.com escribió:

added 2 commits

• 8a3e5d96 - Fix broken specs related to Jenkins service.
• 4f5ffd84 - Merge branch 'fix-services-spec' into 'ce-to-ee'

Compare with previous version

@stanhu @brycepj and I tested it together, it was working nice and beautiful. I tried a few edge cases too but everything was just fine. It's really weird to see that it didn't worked and needed some changes. Do we have some better insight now?

@dbalexandre I'm not sure if this is correct fix of models/project_spec.rb e37bf8d7 Take a look at my fix https://gitlab.com/gitlab-org/gitlab-ee/commit/012e8f56d2bdee01f89d85acef240bdaa8facb53 in my CE->EE merge which you have closed

Why haven't you just continued working on my MR? Lots of stuff have been fixed there.....

added 1 commit

• 2d35098c - Fix spec/models/project_spec.rb

Compare with previous version

@stanhu @rdavila @alfredo1 @vsizov Thanks a lot!

added 1 commit

• fde61543 - Fix rubucop offenses

Compare with previous version

added 1 commit

• 25b842d1 - Create records in database when tracking spent time

Compare with previous version

Failing avatar tests is because of move_to_store use. I had to fix several CE tests for this too; will have a look.

OK looks like Stan already fixed it. Thanks @stanhu !

added 1 commit

• 208f1f27 - Revert "Create records in database when tracking spent time"

Compare with previous version

added 1 commit

• 2bfde899 - Quick fix issuable update when only time spent is updated

Compare with previous version

@dbalexandre Pushed 2bfde899 (see the commit message for details)!

@rymai Thanks

@jacobvosmaer-gitlab Can't take the credit here--@rdavila fixed it; I just merged it. :)

enabled an automatic merge when the build for 2bfde899 succeeds

merged

mentioned in commit 4e86cbda

mentioned in issue #1432

By the way, in preparing 8.14.8 I spent a couple of hours* fixing the problem that 2bfde899 fixed (cherry-picking that fixed it). We should document better such fixes.

• That might be an exaggeration :)