• Grzegorz Bizon's avatar
    Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeeds · 00ca7adc
    Grzegorz Bizon authored
    * master: (110 commits)
      Rewrite an HTTP link to use HTTPS
      Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90ac
      Add blue back to sub nav active
      Remove JSX/React eslint plugins.
      Fix a transient spec failure
      Adds hoverstates for collapsed Issue/Merge Request sidebar
      Moved groups above projects
      Add StackProf to the Gemfile, along with a utility to get a profile for a spec
      Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1
      Add a CHANGELOG entry
      Alert user when logged in user email is not the same as the invitation
      Expose timestamp in build entity used by serializer
      Rename `MergeRequest#pipeline` to `head_pipeline`
      Remove unnecessary database indexes
      CE-specific changes gitlab-org/gitlab-ee#1137
      Fixing typo & Clarifying Key name
      fix started_at check
      fix blob controller spec failure - updated not to use file-path-
      fix blob controller spec failure
      Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security'
      ...
    
    Conflicts:
    	app/controllers/projects/merge_requests_controller.rb
    	lib/api/merge_requests.rb
    	spec/requests/api/merge_requests_spec.rb
    00ca7adc
merge_requests.rb 11.2 KB