Skip to content
Snippets Groups Projects
Commit 98525212 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files

Merge remote-tracking branch 'upstream/master' into pipeline-emails

* upstream/master: (671 commits)
  Only check :can_resolve permission if the note is resolvable
  Use Search::GlobalService.new in the `GET /projects/search/:query` endpoint
  Improve PipelinesFinder spec so that it does not depend on hard-coded database IDs
  Add changelogs/unreleased/.gitkeep
  Archive CHANGELOG entries prior to 8.0 in changelogs/archive.md
  Request only the LDAP attributes we need
  Add notification_settings API calls Use NotificationSetting::EMAIL_EVENTS for params
  Pull import sources from Gitlab::ImportSources
  Fix API issues sorting
  Use gitlab-workhorse 0.8.1
  Update CHANGELOG
  Avoid conflict with admin labels when importing GitHub labels
  Search should compare only the lowercase versions of the project names
  Enable pipeline events by default
  Minor update on CI docs examples
  Move write_note into SlashCommandsHelper and update other dependent specs
  Wait for logout message in login_helpers
  Use wait_for_ajax to avoid database deadlocks after specs are cleaned
  Fix spec failures with spec/features/issues/user_uses_slash_commands_spec.rb
  Require comments must be included before code
  ...
parents 5de54a71 12d4eea4
No related branches found
No related tags found
Loading
Pipeline #
Showing
with 308 additions and 1828 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment