| Age | Commit message (Collapse) | Author |
|---|
|
'master'
removes extra line for empty description
## What does this MR do?
This MR removes an odd line for empty description
## Are there points in the code the reviewer needs to double check?
Not necessary
## Why was this MR needed?
Improve UX
## Screenshots (if relevant)
**Before**
**After**
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #23557 #23695
See merge request !7045
|
|
|
|
Document link syntax introduced by !5586.
See merge request !7049
|
|
|
|
* 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
...
|
|
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
|
|
Stop clearing the database cache on rake cache:clear
See merge request !7056
|
|
Fix documents and comments on Build API `scope`
Fixes #23146
Fixes #19131
See merge request !7044
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
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
|
|
Support LDAP login tabs wrapping to second line (and a few other login fixes)
## What does this MR do?
Fixes some regressions introduced for customers with multiple servers configured for login and/or long label names.
Also, improves styling for the login page on small screens.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
See the bad behavior here: https://gitlab.com/gitlab-org/gitlab-ce/issues/23435#note_17117893
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/23435#note_17117677
See merge request !6993
|
|
Resolve "Cycle analytics date filter is not working"
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22892
See merge request !6906
|
|
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
|
|
Attempting to generate default set of labels would result in
an error:
ArgumentError: wrong number of arguments (given 1, expected 0)
Closes #23649
|
|
Fix bug where e-mails were not being sent out via Sidekiq
Fix bug where e-mails were not being sent out via Sidekiq
By default, ActionMailer uses the "mailers" queue, but this entry
was not included in the list of queues for Sidekiq to use.
For more details:
* https://github.com/plataformatec/devise/wiki/How-To:-Send-devise-emails-in-background-(Resque,-Sidekiq-and-Delayed::Job)
* http://guides.rubyonrails.org/active_job_basics.html
See merge request !7053
|
|
By default, ActionMailer uses the "mailers" queue, but this entry
was not included in the list of queues for Sidekiq to use.
For more details:
* https://github.com/plataformatec/devise/wiki/How-To:-Send-devise-emails-in-background-(Resque,-Sidekiq-and-Delayed::Job)
* http://guides.rubyonrails.org/active_job_basics.html
|
|
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
|
|
|
|
fix font weight of project feature settings
## What does this MR do?
Fixes font weight for project feature settings
## Screenshots (if relevant)
Before:
After:
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/19734#note_16964612
See merge request !6902
|
|
|
|
Use separate queues for all Sidekiq workers
## What does this MR do?
This MR updates all workers so that they (mostly) use their own Sidekiq queues. This in turn allows us to monitor queues more accurately and in the future impose queue specific throttles, limits, etc.
This is a critical part we need in 8.13, despite it being so close to release day.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 for more information.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/23370
See merge request !7006
|
|
|
|
|
|
Grammar fixes in docs
Some minor grammar fixes in a page in the docs
See merge request !6645
|
|
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.
Fixes gitlab-org/gitlab-ce#23370
|
|
Ignore external issues when bulk assigning issues to author of merge request.
Fixes #23552
See merge request !7020
|
|
Change "Group#web_url" to return "/groups/twitter" rather than "/twitter"
Fixes #23527
See merge request !7035
|
|
Add hover to trash icon in notes
## What does this MR do?
Adds hover to trash icon in notes (fixes a ~regression).
## Screenshots (if relevant)
### Before
### After
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #23487
See merge request !7008
|
|
describe blocks
|
|
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
|
|
Fixes error 500 on Runners page (`ActionView::Template::Error (Missing partial kaminari/_paginator`)
Originally reported downstream: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819903
See merge request !5701
|
|
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
|
|
Fix project member access levels
Migrate invalid project members (owner -> master)
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18616
See merge request !6957
|
|
|
|
|
|
|
|
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
|
|
Bring back the old behaviour which was changed by 6b90ccb9.
Fixes #23527.
|
|
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
|
|
'master'
Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method
See merge request !6996
|
|
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
|
|
|
|
Disable warming of the asset cache in Spinach tests under CI
I suspect some combination of Knapsack tests cause no regular Rack tests
to be loaded (i.e. all JavaScript tests), which leads to the error:
ArgumentError: rack-test requires a rack application, but none was given
In CI, we precompile all the assets so there is no need to warm the
asset cache in any case.
Closes #23613
See merge request !7033
|
|
Edit glossary
Grammar fixes & new additions to the glossary page.
See merge request !7027
|
|
I suspect some combination of Knapsack tests cause no regular Rack tests
to be loaded (i.e. all JavaScript tests), which leads to the error:
ArgumentError: rack-test requires a rack application, but none was given
In CI, we precompile all the assets so there is no need to warm the
asset cache in any case.
Closes #23613
|
|
'12622-backup-restore-doesn-t-clear-cache-resulting-in-missing-branches-and-tags' into 'master'
Fix: Backup restore doesn't clear cache
## What does this MR do?
Clears cache when we do backup restoring. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12622
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/12622
See merge request !7019
|
