summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Add test coverage to LFS fetchingci-lfs-fetchKamil Trzcinski2016-06-211-289/+240
|
* Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-21141-535/+11271
|\
| * Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' Robert Speicher2016-06-183-1/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Fix RangeError exceptions when referring to issues or merge requests outside of max database values When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values. Closes #18777 See merge request !4777
| | * Fix RangeError exceptions when referring to issues or merge requests outside ↵Stan Hu2016-06-183-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of max database values When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values. Closes #18777
| * | Merge branch '18714_bulk_assign_labels_icon' into 'master' Jacob Schatz2016-06-181-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes item icon state when for issues that have the same labels assigned ## What does this MR do? Previously if all issues had the same labels the dropdown was showing the labels with indeterminate stated which is wrong. This MR fixes that and shows the correct state. ## What are the relevant issue numbers? Fixes #18714 ## Screenshots (if relevant) **Before** ![label-before](/uploads/c65aa051e773dfea898a0d19767d6ade/label-before.gif) **After** ![label](/uploads/73fd657d104d1081e189e0a9547d483b/label.gif) ## 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 [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4721
| | * | Click until item is unmarked18714_bulk_assign_labels_iconAlfredo Sumaran2016-06-161-1/+1
| | | |
| | * | Fix spelling error on filenameAlfredo Sumaran2016-06-161-0/+0
| | | |
| | * | Fixes icon state when selecting issues that have the same labels assignedAlfredo Sumaran2016-06-161-1/+2
| | | |
| * | | Fix bug in `WikiLinkFilter`.18819-wiki-link-filter-exceptionTimothy Andrew2016-06-181-0/+26
| | |/ | |/| | | | | | | | | | | | | | | | 1. An exception would be raised if the filter was called with an invalid URI. Mainly because we weren't catching the `Addressable` exception. 2. This commit fixes it and adds a spec for the filter.
| * | Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-176-96/+268
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement custom notification level options ![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png) ![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png) part of #12758 See merge request !4389
| | * \ Merge master into issue_12758issue_12758Felipe Artur2016-06-1742-163/+1063
| | |\ \
| | * | | Allow users to set custom notifications in projects they don't own and ↵Felipe Artur2016-06-171-3/+0
| | | | | | | | | | | | | | | | | | | | several fixes to code
| | * | | Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-175-122/+225
| | |\ \ \
| | | * | | Re-use notifications dropdown on user profileFelipe Artur2016-06-164-117/+199
| | | | | |
| | | * | | Refactor custom notifications controller code and add specsFelipe Artur2016-06-142-0/+44
| | | | | |
| | | * | | Expose notification setting events in APIFelipe Artur2016-06-131-5/+24
| | | | | |
| | | * | | Improve notification settings event keys and add some specsFelipe Artur2016-06-131-6/+50
| | | | | |
| | * | | | Implement custom notification level optionsFelipe Artur2016-06-153-6/+94
| | | | | |
| * | | | | Merge branch 'fix-18717' into 'master' Douwe Maan2016-06-173-0/+119
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that group owner cannot request access to a project of their group ## What does this MR do? It fixes two things: - 91ad995d69e1a0f8991fd896f1d9febc109273fe Ensure that group owner cannot request access to a project of their group - ec3ff061148d556757e7cd486cdc6083d77acf34 Ensure group/project owners can see their members' access_level (see the commit message for details) ## Are there points in the code the reviewer needs to double check? Not really, these are pretty simple fixes. ## Why was this MR needed? Because there was an issue created! ## What are the relevant issue numbers? Fixes #18717. ## Does this MR meet the acceptance criteria? - [x] CHANGELOG is not needed since the bug is only present in a 8.9 RC - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4729
| | * | | | | Address Douwe's feedbackfix-18717Rémy Coutable2016-06-172-17/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make it more explicit that `source` must respond to `#group` and that `#group` must be present. - Indent subsequent lines of a multi-line condition. Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | Ensure group/project owners can see their members' access_levelRémy Coutable2016-06-171-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you are the last owner of a group or the owner of a project, you don't have the :update_<source>_member / :destroy_<source>_member abilities, but you do have the :admin_<source>_member so you should be able to see your members access levels. Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | Group owner cannot request access to a project of their groupRémy Coutable2016-06-172-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-182-0/+112
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/todos_controller.rb
| | * | | | | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-171-86/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-structured controller spec Renamed issuable param to issuable_id
| | * | | | | | Added todo controller tests for merge requestsPhil Hughes2016-06-171-37/+90
| | | | | | | |
| | * | | | | | Correctly checks if user is logged in when adding todoPhil Hughes2016-06-171-0/+13
| | | | | | | |
| | * | | | | | Improved manual todosPhil Hughes2016-06-172-0/+52
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Based on feedback from !4502
| * | | | | | Merge branch 'api-endpoints-award-emoji' into 'master' Robert Speicher2016-06-171-0/+198
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API endpoints for award emoji Closes #10884 See merge request !4575
| | * | | | | | fixup! updated docs for api endpoint award emojiZ.J. van de Weg2016-06-171-1/+1
| | | | | | | |
| | * | | | | | Add endpoints for award emoji on notesZ.J. van de Weg2016-06-171-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs also added.
| | * | | | | | Add endpoints for Award EmojiZ.J. van de Weg2016-06-171-0/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only supports Issues and MergeRequests right now because of the consistency of the routes those models provide.
| * | | | | | | Merge branch 'fix-todos-counters' into 'master' Robert Speicher2016-06-171-0/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure Todos counters doesn't count Todos for projects pending delete Use `TodosFinder` instead of `current_user.todos` to filter projects pending delete on Todos counters helpers. Counters should not reflect the number of Todos displayed on the tabs. Fixes #18633 See merge request !4663
| | * | | | | | | Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-171-0/+4
| | | | | | | | |
| * | | | | | | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-171-0/+26
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the unlink feature for SAML connected accounts (social login). This disables the ability to manually unlink your SAML account, if you have one connected. In certain scenarios, the only allowed login mechanism can be SAML, and if you unlink your account you will be locked out of the system (configuration dependent). Fixes #18613 See merge request !4662
| | * | | | | | | | Added CHANGELOG item and fixed Rubocop errorsdisable-saml-account-unlinkPatricio Cano2016-06-141-4/+2
| | | | | | | | | |
| | * | | | | | | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-141-0/+28
| | | | | | | | | |
| * | | | | | | | | Merge branch 'repo-check-require-push-events' into 'master' Robert Speicher2016-06-171-0/+29
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not check repos without push events Reduce false positives from automatic repository checks by skipping projects without push events. See merge request !4684
| | * | | | | | | | Do not check repos without push eventsJacob Vosmaer2016-06-151-0/+29
| | | | | | | | | |
| * | | | | | | | | Merge branch '18034-cache-todo-counter' into 'master' Yorick Peterse2016-06-171-0/+54
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache todo counters (pending/done) See merge request !4438
| | * | | | | | | | Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-171-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - As todos are created/updated inside the TodoService we repopulate the cache just there for both pending/done todos - Todos as mark as done from the TodosController we update cache there too - All the added methods are kept in the User class for cohesion
| * | | | | | | | | Merge branch 'track-total-method-call-time' into 'master' Robert Speicher2016-06-173-6/+111
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track method call times/counts as a single metric This changes method call tracking so only a single metric is emitted regardless of the number of calls. This allows us to more accurately measure the total execution time of a method as well as the number of times a method is called. See 851e3ff7578973c2206628424eac3b951a3c656d for more details. Method call tracking tracked calls individually meaning the end statistics may not always be accurate enough to get a good understanding of where time is spent. See merge request !4754
| | * | | | | | | | | Track method call times/counts as a single metricYorick Peterse2016-06-173-6/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we'd create a separate Metric instance for every method call that would exceed the method call threshold. This is problematic because it doesn't provide us with information to accurately get the _total_ execution time of a particular method. For example, if the method "Foo#bar" was called 4 times with a runtime of ~10 milliseconds we'd end up with 4 different Metric instances. If we were to then get the average/95th percentile/etc of the timings this would be roughly 10 milliseconds. However, the _actual_ total time spent in this method would be around 40 milliseconds. To solve this problem we now create a single Metric instance per method. This Metric instance contains the _total_ real/CPU time and the call count for every instrumented method.
| * | | | | | | | | | Merge branch 'sidekiq-api-metrics' into 'master' Achilleas Pipinellis2016-06-171-0/+40
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added API endpoint for Sidekiq Metrics. ## What does this MR do? It adds an API endpoint to gather metrics about Sidekiq, it's jobs, queues, and processes. ## Why was this MR needed? There was no API endpoint for Sidekiq information. ## What are the relevant issue numbers? Fixes #7171 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !4653
| | * | | | | | | | | Fixed Rubocop errorPatricio Cano2016-06-171-0/+40
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'registry-500-fix' into 'master' Rémy Coutable2016-06-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly support application/json in Container Registry ## What does this MR do? When requesting tags a `application/json` is used by `docker/distribution`. ## Why was this MR needed? Fixes regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669 ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18736 See merge request !4742
| | * | | | | | | | | Fix regression introduced by ↵registry-500-fixKamil Trzcinski2016-06-171-1/+1
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669 When requesting tags a `application/json` is used.
| * | | | | | | | | Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master' Robert Speicher2016-06-171-18/+34
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error when editing an issuable with a task list Closes #18712 See merge request !4751
| | * | | | | | | | | Fix error when editing an issuable with a task listfix-toggling-task-should-not-generate-todoDouglas Barbosa Alexandre2016-06-171-18/+34
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'secure-request-uris' into 'master' Yorick Peterse2016-06-171-0/+16
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter out sensitive parameters of metrics data See merge request !4748
| | * | | | | | | | | Filter out sensitive parameters of metrics dataPaco Guzman2016-06-171-0/+16
| | | |/ / / / / / / | | |/| | | | | | |
View Lorry Controller Status