* master: (22 commits)
Fix status code expectation
Stop clearing the database cache on rake cache:clear
Fix error in generating labels
Fix bug where e-mails were not being sent out via Sidekiq
Fix documents and comments on Build API `scope`. #23146#19131
Re-organize queues to use for Sidekiq
Fix wrong endpoint in api/users documentation, fix same typo in spec describe blocks
Update CHANGELOG
Fix object data to be sent to fetch analytics data
Fixed compare ellipsis messing with layout
Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".
fix font weight of project feature settings
Add hover to trash icon in notes
Ensure custom provider tab labels don't break layout.
Fixed issue when images are loading it would push off the tabs
Fixed issues with sticky mr tabs & sidebar
Refactor and add new functionality to CI yaml reference
Ignore external issues when bulk assigning issues to author of merge request.
Changed gitlab-shell version to avoid warning when precompiling the assets.
Grammar fixes in docs
...
mail_room was configured to deliver mail to the `incoming_email`
queue while `EmailReceiveWorker` was reading the `email_receiver`
queue. Adds a migration that repeats the work of a previous
migration to ensure all mails that wound up in the old
queue get processed.
Closes#23689
After a project import, there's a chance that the UI checks the
branch count before the project has been imported. This change
causes more of the keys to be flushed after an import and forces
a rebuild of the repository cache.
Closes#13518
Fix error in generating labels
Attempting to generate default set of labels would result in
an error:
ArgumentError: wrong number of arguments (given 1, expected 0)
Closes#23649
See merge request !7055
Fix docker.sock reference in config.toml
## What does this MR do?
`config.toml` sample did not correctly represent the `/var/run/docker.sock` mapping, causing it to be created as a volume instead.
## Why was this MR needed?
It was broken.
See merge request !5172
Refactor and add new environment functionality to CI yaml reference
## What does this MR do?
Add new `environment` functionality to the yaml reference.
## What are the relevant issue numbers?
Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23484
See merge request !7026
Fix wrong example in api/users documentation
## What does this MR do?
Just a small typo fix in API docs. While greping for this typo I also found couple more places with same mistake and included them in the MR too.
See merge request !7043
Changed gitlab-shell version to avoid warning when precompiling the assets.
## What does this MR do?
Changes installation instructions from source to install v3.6.1 of gitlab-shell to avoid a pre-compile warning on gitlab.
See merge request !6747
Dumping too many jobs in the same queue (e.g. the "default" queue) is a
dangerous setup. Jobs that take a long time to process can effectively
block any other work from being performed given there are enough of
these jobs.
Furthermore it becomes harder to monitor the jobs as a single queue
could contain jobs for different workers. In such a setup the only
reliable way of getting counts per job is to iterate over all jobs in a
queue, which is a rather time consuming process.
By using separate queues for various workers we have better control over
throughput, we can add weight to queues, and we can monitor queues
better. Some workers still use the same queue whenever their work is
related. For example, the various CI pipeline workers use the same
"pipeline" queue.
This commit includes a Rails migration that moves Sidekiq jobs from the
old queues to the new ones. This migration also takes care of doing the
inverse if ever needed. This does require downtime as otherwise new jobs
could be scheduled in the old queues after this migration completes.
This commit also includes an RSpec test that blacklists the use of the
"default" queue and ensures cron workers use the "cronjob" queue.
Fixesgitlab-org/gitlab-ce#23370
Fixed compare ellipsis messing with layout
## What does this MR do?
Fixed a bug where the ellipsis would cause the form to mess with the layout.
## Screenshots (if relevant)
See merge request !7042
Fixed issues with sticky mr tabs & sidebar
## What does this MR do?
- Fixes an issue where opening the sidebar wouldn't update the merge request tabs width & positioning
- Fixes issues when resizing the browser
Rather than updating the JS to react to different methods, this way allows the CSS to keep control of the positioning & sizes.
## What are the relevant issue numbers?
Closes#23504
See merge request !6990
Update Documentation image when configuring Build emails in Services
## What does this MR do?
Replace old GitLab image in documentation with a new image showing the new position of Services and the module 'Build emails'
## Why was this MR needed?
GitLab's layout changed with version 8.9 and the buttons were moved.
See merge request !5139
Fix broken label uniqueness label migration
The previous implementation of the migration failed on staging because
the migration was attempted to remove labels from projects that did not
actually have duplicates. This occurred because the SQL query did not
account for the project ID when selecting the labels.
To replicate the problem:
1. Disable the uniqueness validation in app/models/label.rb.
2. Create a duplicate label "bug" in project A.
3. Create the same label in project B with label "bug".
The migration will attempt to remove the label in B even if there are no duplicates.
To fix the issue, include the project ID when selecting the labels.
Closes#23609
See merge request !7030
Change target Ruby version for RuboCop to 2.1
We have to use the lowest common denominator to check the supported syntax and in our case it is Ruby 2.1. Please note that it will not help with unsupported syntax in HAML files because they are not checked by Rubocop.
See merge request !6978
[Doc] Fix `ref` parameter name for `commits/statuses`
The attribute to filter by branch or tag needs to be named `ref`, not `ref_name`. And indeed the attribute in the JSON response is `ref` (and not `ref_name`).
Tested on Gitlab CE 8.9.
See merge request !4876
The previous implementation of the migration failed on staging because
the migration was attempted to remove labels from projects that did not
actually have duplicates. This occurred because the SQL query did not
account for the project ID when selecting the labels.
To replicate the problem:
1. Disable the uniqueness validation in app/models/label.rb.
2. Create a duplicate label "bug" in project A.
3. Create the same label in project B with label "bug".
The migration will attempt to remove the label in B even if there are no duplicates.
Closes#23609
Yorick Peterse
Fatih Acet
Nur Rony
Rémy Coutable
Stan Hu
Nick Thomas
Jacob Schatz
Achilleas Pipinellis
Winnie
Annabel Dunstone Gray
Lemures Lemniscati
Douwe Maan
Sean McGivern
Airat Shigapov
Alfredo Sumaran
Phil Hughes
Adam Niedzielski
Robert Speicher