summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Extended the current error message and suggestion message to include the ↵lbennett/gitlab-ce-17467-Add-a-message-to-the-404-page-to-indicate-it-may-be-a-permission-issueLuke Bennett2016-06-182-5/+14
| | | | | | | | | | possibility of a permissions issue, also made the error page responsive whilst I was at it Updated CHANGELOG Changed message to "You aren't where you think you are" Changed sub-text
* Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-1734-249/+643
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Small frontend code fixes and restore 8a2d88f commitFelipe Artur2016-06-172-7/+11
| |
| * Merge master into issue_12758issue_12758Felipe Artur2016-06-17208-1565/+11605
| |\
| * | Allow users to set custom notifications in projects they don't own and ↵Felipe Artur2016-06-1712-59/+24
| | | | | | | | | | | | several fixes to code
| * | Fixed bug with label clicking in modal not workingPhil Hughes2016-06-171-4/+3
| | |
| * | Fixed bug with clicking custom again not opening modalPhil Hughes2016-06-172-1/+4
| | |
| * | Description for custom in dropdownPhil Hughes2016-06-171-5/+5
| | |
| * | Fixed alignment of notification dropdown menuPhil Hughes2016-06-173-4/+6
| | |
| * | Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-1727-263/+418
| |\ \
| | * | Re-use notifications dropdown on user profileFelipe Artur2016-06-1625-264/+361
| | | |
| | * | Update migration to match current schema versionFelipe Artur2016-06-141-0/+0
| | | |
| | * | Refactor custom notifications controller code and add specsFelipe Artur2016-06-147-20/+65
| | | |
| | * | Remove schema from branch historyFelipe Artur2016-06-1311-39/+170
| | | |
| | * | Add notification settings documentation and update screenshotFelipe Artur2016-06-133-2/+5
| | | |
| | * | Expose notification setting events in APIFelipe Artur2016-06-132-6/+26
| | | |
| | * | Improve notification settings event keys and add some specsFelipe Artur2016-06-133-50/+102
| | | |
| | * | Implement custom notification level optionsFelipe Artur2016-06-133-23/+69
| | | |
| * | | Added description to custom option in notification dropdownPhil Hughes2016-06-162-6/+8
| | | | | | | | | | | | | | | | Always shows the custom option in the dropdown
| * | | Implement custom notification level optionsFelipe Artur2016-06-1518-78/+354
| | | |
* | | | Merge branch 'fix-18717' into 'master' Douwe Maan2016-06-176-11/+137
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-174-20/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-173-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-173-9/+49
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-188-28/+144
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/todos_controller.rb
| * | | | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-174-89/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-structured controller spec Renamed issuable param to issuable_id
| * | | | | Removed ID from button as frontend doesnt use anymorePhil Hughes2016-06-171-1/+1
| | | | | |
| * | | | | Removed todo from JSON responsePhil Hughes2016-06-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Frontend doesnt use it
| * | | | | Added todo controller tests for merge requestsPhil Hughes2016-06-171-37/+90
| | | | | |
| * | | | | Checks for current_user when getting todoPhil Hughes2016-06-171-1/+1
| | | | | |
| * | | | | Correctly checks if user is logged in when adding todoPhil Hughes2016-06-172-1/+14
| | | | | |
| * | | | | Improved manual todosPhil Hughes2016-06-178-28/+85
| |/ / / / | | | | | | | | | | | | | | | Based on feedback from !4502
* | | | | Merge branch 'gh-webhooks' into 'master' Robert Speicher2016-06-172-6/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid that GitHub import fails when retrieving Webhooks for non GitHub admins Closes #18729 See merge request !4723
| * | | | | Warn about admin privilege to disable GitHub WebhooksDouglas Barbosa Alexandre2016-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Listing GH Webhooks doesn't stop import process for non GH admin usersDouglas Barbosa Alexandre2016-06-171-5/+18
| | | | | |
* | | | | | Merge branch 'api-endpoints-award-emoji' into 'master' Robert Speicher2016-06-178-30/+722
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | API endpoints for award emoji Closes #10884 See merge request !4575
| * | | | | fixup! updated docs for api endpoint award emojiZ.J. van de Weg2016-06-173-24/+188
| | | | | |
| * | | | | Add endpoints for award emoji on notesZ.J. van de Weg2016-06-174-74/+341
| | | | | | | | | | | | | | | | | | | | | | | | Docs also added.
| * | | | | Sort API endpoints and implement feedbackZ.J. van de Weg2016-06-175-35/+41
| | | | | |
| * | | | | Add endpoints for Award EmojiZ.J. van de Weg2016-06-175-1/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only supports Issues and MergeRequests right now because of the consistency of the routes those models provide.
* | | | | | Merge branch 'commit-header' into 'master' Jacob Schatz2016-06-172-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes header vertical centering. Fixes header centering. ![ss__2016-05-16_at_5.26.30_PM](/uploads/300b64afc6585023f0e0dbbf721c359a/ss__2016-05-16_at_5.26.30_PM.png) cc @dzaporozhets See merge request !4170
| * | | | | | Fixed issue with dropdown buttonscommit-headerPhil Hughes2016-06-171-1/+1
| | | | | | |
| * | | | | | Use line-height instead of height.Jacob Schatz2016-06-172-3/+3
| | | | | | |
| * | | | | | Fixes header vertical centering.Jacob Schatz2016-06-171-0/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-todos-counters' into 'master' Robert Speicher2016-06-177-23/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-06-171-0/+1
| | | | | | |
| * | | | | | Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-176-23/+50
| | | | | | |
* | | | | | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-174-4/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-4/+3
| | | | | | | |
| * | | | | | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-143-4/+36
| | | | | | | |
View Lorry Controller Status