summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
Commit message (Collapse)AuthorAgeFilesLines
* Stop unauthized users dragging on issue boardsboard-dragging-disabledPhil Hughes2016-10-251-1/+2
| | | | Closes #23763
* Merge branch 'escape-relative-links' into 'master' Sean McGivern2016-10-251-0/+1
|\ | | | | | | | | | | | | Escape `ref` and `path` in `RelativeLinkFilter`. fixes #21420 See merge request !6050
| * Escape ref and path for relative links (!6050)winniehell2016-10-241-0/+1
| |
* | Merge branch 'sh-fix-labels-move-issue' into 'master' Rémy Coutable2016-10-251-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where labels would be assigned to issues that were moved If you attempt to move an issue from one project to another and leave labels blank, LabelsFinder would assign all labels in the new project to that issue. The issue is that :title is passed along to the Finder, but since it appears empty no filtering is done. As a result, all labels in the group are returned. This fix handles that case. Closes #23668 See merge request !7065
| * | Fix bug where labels would be assigned to issues that were movedStan Hu2016-10-241-0/+1
| |/ | | | | | | | | | | | | | | | | | | If you attempt to move an issue from one project to another and leave labels blank, LabelsFinder would assign all labels in the new project to that issue. The issue is that :title is passed along to the Finder, but since it appears empty no filtering is done. As a result, all labels in the group are returned. This fix handles that case. Closes #23668
* | Merge branch 'register-tab' into 'master' Jacob Schatz2016-10-251-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show register tab if signup enabled. ## What does this MR do? Fixes a regression where the register tab is activated, even if sign-up enabled is not activated in application_settings. ## Screenshots (if relevant) When signup is disabled: ![Screen_Shot_2016-10-22_at_8.56.23_PM](/uploads/bd0fa5f27114779c0d290a8151c1c253/Screen_Shot_2016-10-22_at_8.56.23_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] 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/23654 See merge request !7058
| * Only show register tab if signup enabled.Bryce Johnson2016-10-241-0/+1
| |
* | Merge branch '23325-pipeline-graph-hidden' into 'master' Alfredo Sumaran2016-10-241-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline graph hidden on commit and mr pages ## What does this MR do? Dynamically invokes `new gl.Pipelines();` when an MR `builds` tab is clicked. Dispatches `new gl.Pipelines();` on a `commit#builds` page. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The pipeline graph was hidden on commit and mr pages ## Screenshots (if relevant) Commit page: ![Screen_Shot_2016-10-14_at_18.16.18](/uploads/ee11dea0825d1489dc167292e16c8f41/Screen_Shot_2016-10-14_at_18.16.18.png) MR: ![Screen_Shot_2016-10-14_at_18.16.39](/uploads/602c2fce2397c799bedb757bfd3010af/Screen_Shot_2016-10-14_at_18.16.39.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? Closes #23325 See merge request !6895
| * | invoked the pipelines class when builds are dynamically loaded and ↵Luke Bennett2016-10-241-0/+1
| | | | | | | | | | | | dispatched for commit builds page
* | | Update CHANGELOG23665-build-sidebar-has-extra-space-on-firefoxAlfredo Sumaran2016-10-241-0/+1
|/ /
* | Merge branch 'sign_in_forgot_password' into 'master' Fatih Acet2016-10-241-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sign in page Forgot your password link overlap ## What does this MR do? Fix Sign in page 'Forgot your password?' link overlaping on medium-large screens ## Why was this MR needed? Overlapping text as per #23630 ## Screenshots (if relevant) ![sign-in-page](/uploads/a94084297e447fe58f0af6f199e74248/sign-in-page.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 - [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? #23630 See merge request !7059
| * Merge branch 'master' into sign_in_forgot_passwordBernardo Anderson2016-10-221-0/+5
| |\
| * | Fix sign in page Forgot your password link overlapBernardo Anderson2016-10-221-0/+1
| | |
* | | Added path parameter to Commits APILuis HGO2016-10-241-0/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'barthc/gitlab-ce-prevent_authored_vote_from_notes'Rémy Coutable2016-10-241-0/+1
|\ \ \ | | | | | | | | | | | | See merge request !6544.
| * | | Fix authored vote from notesbarthc2016-10-241-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch ↵Dmitriy Zaporozhets2016-10-241-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'yesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-success' Merge request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6979
| * | | | Move changelog item to 8.14Dmitriy Zaporozhets2016-10-241-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-241-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | Merge branch '21513-fix-branch-protection-api' into 'master' Douwe Maan2016-10-241-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix branch protection API. ## What does this MR do? - Fixes the branch protection API. - Closes #21513 - EE Merge Request: gitlab-org/gitlab-ee!718 ## Tasks - [ ] #21513 !6215 Protected branches API bug - [x] Investigate - [x] Test + Fix - [x] Changelog - [x] MR - [x] Wait for build to pass - [x] Review - [x] Check for EE conflicts - [x] Create EE MR - [x] Refactor + Fix - [x] Rebase EE MR against EE master - [x] Wait for builds to pass - [x] Assign to dbalexandre/douwe - [x] Implement latest review comments - [x] Wait for Douwe's review - [x] Implement changes - [x] Port changes to EE MR - [x] Assign both back to Douwe - [ ] Wait for merge - [ ] Merge gitlab-org/gitlab-ee!718 See merge request !6215
| * | | | Update CHANGELOGTimothy Andrew2016-10-241-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'dz-fix-constrainer-for-relative-url' into 'master' Sean McGivern2016-10-241-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix constrainers for relative url Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23675 See merge request !7071
| * | | | Add changelog item for groups 404 on relative urldz-fix-constrainer-for-relative-urlDmitriy Zaporozhets2016-10-241-0/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'issue-boards-user-url' into 'master' Fatih Acet2016-10-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use root_url for issue boards user link ## What does this MR do? Rather than using `/` as the root path, it now correctly sends the root URL from Rails to prevent errors with installations in subdirectories. ## What are the relevant issue numbers? Closes #23556 See merge request !7018
| * | | | Use root_url for issue boards user linkPhil Hughes2016-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #23556
* | | | | Merge branch 'remove-callback' into 'master' Rémy Coutable2016-10-241-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR removes AR before_validation callback in favor setter. ## Why was this MR needed? Because setters is good practice to normalize model attributes instead AR callbacks. Because new object should be valid right after initialization. If it MR interested I can try to find other places where we can use setters. See merge request !6763
| * | | | refactor(email): use setter method instead AR callbacksSemyon Pupkov2016-10-231-0/+1
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'origin/sh-flush-cache-after-import'Yorick Peterse2016-10-241-0/+1
|\ \ \ \
| * | | | Expire and build repository cache after project importStan Hu2016-10-231-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 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-231-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'master' into 23557-remove-extra-line-for-empty-issue-descriptionNur Rony2016-10-241-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | Merge branch 'sh-fix-broken-label-controller' into 'master' Rémy Coutable2016-10-221-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 error in generating labelssh-fix-broken-label-controllerStan Hu2016-10-221-0/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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 '23146_19131_build-api_scope-doc' into 'master' Rémy Coutable2016-10-221-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-0/+1
| | | |
| * | | Merge branch '22892-cycle-analytics-date-filter-is-not-working' into 'master' Fatih Acet2016-10-221-0/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 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
| | | |
| * | | Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-211-0/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'bugfix/add_hover_to_trash_icon' into 'master' Annabel Dunstone Gray2016-10-211-0/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Add hover to trash icon in notesblackst0ne2016-10-211-0/+1
| | | |
* | | | adds entry in CHANGELOGNur Rony2016-10-211-1/+1
|/ / /
* | | Merge branch 'fix_project_member_access_levels' into 'master' Sean McGivern2016-10-211-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 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
| * | Fix project member access levelsfix_project_member_access_levelsValery Sizov2016-10-211-0/+1
| | |
* | | Merge branch '14192-issues-closed-by-merge-requests-using-metrics-data' into ↵Yorick Peterse2016-10-211-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method See merge request !6996
| * | | Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests ↵14192-issues-closed-by-merge-requests-using-metrics-dataPaco Guzman2016-10-201-0/+2
| | | | | | | | | | | | | | | | method
* | | | Merge branch ↵Valery Sizov2016-10-211-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | Fix: Backup restore doesn't clear cache12622-backup-restore-doesn-t-clear-cache-resulting-in-missing-branches-and-tagsValery Sizov2016-10-201-0/+1
| | | | |
* | | | | Trim project_path whitespace on form submitLinus G Thiel2016-10-201-0/+1
| |_|_|/ |/| | | | | | | | | | | When the form is submitted, any leading and/or trailing whitespace is trimmed.
View Lorry Controller Status