* 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
* master: (312 commits)
Fix bad selection on dropdown menu for tags filter
Fixed issue boards scrolling with a lot of lists & issues
You can only assign default_branch when editing a project ...
Don't convert data which already is the target type
Stop supporting Google and Azure as backup strategies
renames some of the specs and adds changelog entry
Fixed dragging issue moving wrong issue after multiple drags of issue
Fixed issue boards issue sorting when dragging issue into list
Rephrase some system notes to be compatible with new system note style
Add missing JIRA file that redirects to the new location
Fix documentation to create the `pg_trm` extension before creating the DB
Document that we always use `do...end` for `before` in RSpec
Backport Note#commands_changes from EE
Log mv_namespace parameters
Add default_branch attr to Project API payload in docs.
Fix title case to sentence case
properly escape username validation error message flash
Remove header ids from University docs
Add missing documentation.
Added test that checks the correct select box is there for the LFS ...
...
Conflicts:
app/services/system_note_service.rb
spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb
spec/services/system_note_service_spec.rb
* upstream/master: (126 commits)
Allow to search for user by secondary email address in the admin interface
Rename :name search parameter to :search_query at /admin/users
Fix project features default values
Add a link to the Issue Boards API in main README
Fix Markdown styling inside reference links
Fix relative links in Markdown wiki when displayed in "Project" tab
Flexbox webkit prefixes
Tests update
Tests update
Changed where merge request link is
New todos blank state
Implement CreateMembers service to make controller thin
Do not show tooltip for active element (!7105)
Update CHANGELOG
Assign local_assigns[:subject] to a variable on the shared label partial
Use select instead of pluck on Project.group_ids
Skip authorization check when searching for labels on IssuableFinder
Use label subject to calculate number of issues/mrs within the group
Remove unnecessary includes(:priorities) on Projects::LabelsController
Add 8.13.2 CHANGELOG entries
...
Add pipelines tab to new MR
#### What does this MR do?
Adds pipelines tab to new MRs
#### Screenshots (if relevant)
#### What are the relevant issue numbers?
Closes#21444
See merge request !6238
Douwe Maan
Sam Rose
Grzegorz Bizon
Sean McGivern
Jarka Kadlecova
Robert Speicher
Jarka Kadlecova
Tiago Botelho
Filipa Lacerda
Kamil Trzciński
Adam Niedzielski
Ruben Davila
Alex Sanford
Rémy Coutable
Robert Speicher
Lin Jen-Shin
Guilherme Salazar
Nick Thomas
Douglas Barbosa Alexandre
Fatih Acet
Sean McGivern