summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update project member controller to match recent master logicyesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-successDmitriy Zaporozhets2016-10-241-9/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add parentheses around return redirect_to methodDmitriy Zaporozhets2016-10-242-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Trigger change even in select2 test helper to produce production-like behaviourDmitriy Zaporozhets2016-10-241-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor js that disable form submit if no members selectedDmitriy Zaporozhets2016-10-243-6/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve create project member test at project_members_controller_specDmitriy Zaporozhets2016-10-241-25/+16
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move changelog item to 8.14Dmitriy Zaporozhets2016-10-241-1/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor create member tests from group_members_controller_specDmitriy Zaporozhets2016-10-241-41/+30
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor groups/projects members controllerDmitriy Zaporozhets2016-10-242-9/+11
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-248-3/+130
| | | | | | | | | | | | | | | | - Disable {project, group} members submit button if no users If no users are selected, the submit button should be disabled. - Alert user when no users were added to {project, group}. When no users were selected for adding, an alert message is flashed that no users were added. - Also, this commit adds a feedback when users were actually added to a project, in symmetry with how group members are handled. Closes #22967, #23270.
* Revert "Change "Group#web_url" to return "/groups/twitter" rather than ↵Dmitriy Zaporozhets2016-10-243-25/+16
| | | | | | "/twitter"." This reverts commit c81ff152e08d58c13efbd50c40dd2e083ac65083.
* Merge remote-tracking branch 'origin/sh-flush-cache-after-import'Yorick Peterse2016-10-243-28/+21
|\
| * Remove duplicate code in repository cache clearingsh-flush-cache-after-importStan Hu2016-10-231-8/+1
| |
| * Expire and build repository cache after project importStan Hu2016-10-233-20/+20
| | | | | | | | | | | | | | | | | | 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
* | Merge branch 'sh-fix-mailroom-config' into 'master' Yorick Peterse2016-10-244-2/+66
|\ \ | | | | | | | | | | | | Fix reply-by-email not working due to queue name mismatch See merge request !7068
| * | Fix reply-by-email not working due to queue name mismatchsh-fix-mailroom-configStan Hu2016-10-234-2/+66
| |/ | | | | | | | | | | | | | | | | | | 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
* | Merge branch '23557-remove-extra-line-for-empty-issue-description' into ↵Fatih Acet2016-10-244-3/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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** ![ss__2016-10-19_at_11.04.45_PM](/uploads/12b376c772115c2e5eef2fe0c0d1992f/ss__2016-10-19_at_11.04.45_PM.png) **After** ![edi](/uploads/89fea59ef5267974af4cbe1064dc521a/edi.png) ## 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
| * | removes extra line for empty milestone description23557-remove-extra-line-for-empty-issue-descriptionNur Rony2016-10-242-2/+2
| | |
| * | code formatting correctedNur Rony2016-10-241-1/+1
| | |
| * | Merge branch 'master' into 23557-remove-extra-line-for-empty-issue-descriptionNur Rony2016-10-2493-244/+816
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | adds entry in CHANGELOGNur Rony2016-10-211-1/+1
| | |
| * | removes extra line for empty issue descriptionNur Rony2016-10-212-1/+3
| | |
* | | Merge branch 'document-absolute-links' into 'master' Rémy Coutable2016-10-241-0/+8
|\ \ \ | |_|/ |/| | | | | | | | Document link syntax introduced by !5586. See merge request !7049
| * | Document link syntax introduced by !5586document-absolute-linksWinnie2016-10-211-0/+8
| | |
* | | Merge branch 'sh-fix-broken-label-controller' into 'master' Rémy Coutable2016-10-223-1/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 status code expectationRémy Coutable2016-10-221-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Fix error in generating labelssh-fix-broken-label-controllerStan Hu2016-10-223-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to generate default set of labels would result in an error: ArgumentError: wrong number of arguments (given 1, expected 0) Closes #23649
* | | | Merge branch '23653-dont-clear-db-cache-every-release' into 'master' Yorick Peterse2016-10-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Stop clearing the database cache on rake cache:clear See merge request !7056
| * | | | Stop clearing the database cache on rake cache:clearNick Thomas2016-10-221-1/+1
| | | | |
* | | | | Merge branch '23146_19131_build-api_scope-doc' into 'master' Rémy Coutable2016-10-223-6/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix documents and comments on Build API `scope` Fixes #23146 Fixes #19131 See merge request !7044
| * | | | | Fix documents and comments on Build API `scope`. #23146 #19131Lemures Lemniscati2016-10-223-6/+7
| | | | | |
* | | | | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-10-221-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Fix docker.sock reference in config.toml Niels Keurentjes2016-07-101-1/+1
| | | | | | | | | | | | | | | | | | Mapping was omitted so it would just create a temp volume.
* | | | | | Merge branch 'ldap-login-styles' into 'master' Jacob Schatz2016-10-223-3/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) ![2016-10-19_16.34.00](/uploads/2816545b4db60ddb6430c458c2c41582/2016-10-19_16.34.00.gif) ![2016-10-19_18.07.26](/uploads/53340d5894db6441cc82b182fb47cf18/2016-10-19_18.07.26.gif) ## 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
| * | | | | | Ensure custom provider tab labels don't break layout.ldap-login-stylesBryce Johnson2016-10-203-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (Also fix some issues for session views on small screens.)
* | | | | | | Merge branch '22892-cycle-analytics-date-filter-is-not-working' into 'master' Fatih Acet2016-10-222-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cycle analytics date filter is not working" Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22892 See merge request !6906
| * | | | | | | Update CHANGELOG22892-cycle-analytics-date-filter-is-not-workingAlfredo Sumaran2016-10-211-0/+1
| | | | | | | |
| * | | | | | | Fix object data to be sent to fetch analytics dataAlfredo Sumaran2016-10-211-1/+5
| | | | | | | |
* | | | | | | | Merge branch 'docs/dynamic-envs-yaml' into 'master' Achilleas Pipinellis2016-10-221-25/+135
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Refactor and add new functionality to CI yaml referencedocs/dynamic-envs-yamlAchilleas Pipinellis2016-10-201-25/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci ski]
* | | | | | | | Merge branch 'sh-add-mailers-to-sidekiq-config' into 'master' v8.14.0.preStan Hu2016-10-221-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Fix bug where e-mails were not being sent out via SidekiqStan Hu2016-10-211-0/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge branch 'fix-example-in-api-documentation' into 'master' Rémy Coutable2016-10-222-4/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 wrong endpoint in api/users documentation, fix same typo in spec ↵Airat Shigapov2016-10-212-4/+4
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | describe blocks
* | | | | | | Merge branch 'project-settings--features-weight' into 'master' Annabel Dunstone Gray2016-10-212-60/+72
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | fix font weight of project feature settingsproject-settings--features-weighttauriedavis2016-10-202-60/+72
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-2162-68/+425
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-2162-68/+425
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-211-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grammar fixes in docs Some minor grammar fixes in a page in the docs See merge request !6645
| * | | | | | | Grammar fixes in docsWilfred Hughes2016-10-031-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-211-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status