- 22 Oct, 2016 4 commits
-
-
Stan Hu authored
Attempting to generate default set of labels would result in an error: ArgumentError: wrong number of arguments (given 1, expected 0) Closes #23649
-
Stan Hu authored
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
-
Stan Hu authored
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
-
Rémy Coutable authored
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
-
- 21 Oct, 2016 26 commits
-
-
Annabel Dunstone Gray authored
fix font weight of project feature settings ## What does this MR do? Fixes font weight for project feature settings ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-14_at_9.49.06_AM](/uploads/76e1f91cd8f6fcf9197a51215b497e4a/Screen_Shot_2016-10-14_at_9.49.06_AM.png) After: ![Screen_Shot_2016-10-14_at_11.43.44_AM](/uploads/ecb378400d787c50dba2c3833bb72964/Screen_Shot_2016-10-14_at_11.43.44_AM.png) ## 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
-
Douwe Maan authored
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
-
Rémy Coutable authored
Grammar fixes in docs Some minor grammar fixes in a page in the docs See merge request !6645
-
Rémy Coutable authored
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
-
Yorick Peterse authored
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
-
Sean McGivern authored
Ignore external issues when bulk assigning issues to author of merge request. Fixes #23552 See merge request !7020
-
Sean McGivern authored
Change "Group#web_url" to return "/groups/twitter" rather than "/twitter" Fixes #23527 See merge request !7035
-
Annabel Dunstone Gray authored
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 ![Peek_2016-10-20_16-02](/uploads/5b7b94e0a0a3cd7c33d60084ff364f42/Peek_2016-10-20_16-02.gif) ### After ![Peek_2016-10-20_16-01](/uploads/b365eea616efdb7de98900e2925a4813/Peek_2016-10-20_16-01.gif) ## 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
-
Airat Shigapov authored
-
Fatih Acet authored
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) ![Screen_Shot_2016-10-21_at_13.45.37](/uploads/d1dc18d294dace599b8036541b70ccaf/Screen_Shot_2016-10-21_at_13.45.37.png) See merge request !7042
-
Rémy Coutable authored
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
-
Fatih Acet authored
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
-
Sean McGivern authored
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
-
Phil Hughes authored
-
Rémy Coutable authored
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
-
Rémy Coutable authored
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
-
Adam Niedzielski authored
Bring back the old behaviour which was changed by 6b90ccb9. Fixes #23527.
-
Robert Speicher authored
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
-
Rémy Coutable authored
[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
-
Yorick Peterse authored
Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method See merge request !6996
-
Stan Hu authored
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
-
Valery Sizov authored
-
Rémy Coutable authored
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
-
Sean Packham authored
Edit glossary Grammar fixes & new additions to the glossary page. See merge request !7027
-
Stan Hu authored
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
-
Valery Sizov authored
Merge branch '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
-
- 20 Oct, 2016 10 commits
-
-
Alfredo Sumaran authored
Trim project_path whitespace on form submit ## What does this MR do? Trim leading/trailing whitespace on project_path input when focus leaves. ## Are there points in the code the reviewer needs to double check? If tests are deemed necessary? ## Why was this MR needed? To handle a reported bug #3212. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [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) - [x] Branch has no merge conflicts with `master` (if you do - 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 #3212 See merge request !6710
-
tauriedavis authored
-
blackst0ne authored
-
Linus G Thiel authored
When the form is submitted, any leading and/or trailing whitespace is trimmed.
-
evhoffmann authored
-
evhoffmann authored
-
Stan Hu authored
Don't use Hash#slice since it's not supported in Ruby 2.1 There is currently a build failure in `master` and this MR fixes it. The issue was introduced by !6879. The problem is that `Hash#slice` doesn't exists in Ruby 2.1. I've created an issue to take care of the other places we're using `Hash#slice`: #23590 See merge request !7025
-
Douwe Maan authored
[ci skip] Add a comment explaining validate_board_limit callback ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/929 See merge request !7023
-
Phil Hughes authored
-
Phil Hughes authored
Closes #23504
-