summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Add fade divs as li elementsli-fadeAnnabel Dunstone2016-06-206-12/+12
|
* Put some admin settings in dropdowndz-admin-tabs-dropdownDmitriy Zaporozhets2016-06-205-71/+75
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move appearance settings as sub tab to application settingsdz-admin-tabsDmitriy Zaporozhets2016-06-204-14/+23
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'star-fork-mobile' into 'master' Jacob Schatz2016-06-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display Star and Fork on mobile, fix #18537. ## What does this MR do? Displays the Star and Fork buttons on mobile devices. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? I wanted to star and/or fork projects while on my phone, I couldn't do that before. ## What are the relevant issue numbers? #18537 ## Screenshots (if relevant) ![Screen_Shot_2016-06-16_at_11.41.24_AM](/uploads/053ac0c1b39a7b1b30fffb0a8d43cffb/Screen_Shot_2016-06-16_at_11.41.24_AM.png) cc: @jschatz1 See merge request !4714
| * Display Star and Fork on mobile, fix #18537.star-fork-mobileConnor Shea2016-06-161-1/+1
| |
* | Merge branch 'milestones-show-mrs' into 'master' Jacob Schatz2016-06-181-0/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add merge request data to the progress information on Milestones pages. ## What does this MR do? Adds data about merge requests to the Milestone show view. It previously only showed something like `3 issues: 2 open and 1 closed 20% complete`, now it shows `3 issues: 2 open and 1 closed 2 merge requests: 2 open and 0 merged 20% complete`. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? The milestone progress % didn't accurately reflect the open/merged MRs. ## What are the relevant issue numbers? Fixes #13980 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-16_at_2.12.57_PM](/uploads/99a044ea918b23fe93cef3305c21086e/Screen_Shot_2016-06-16_at_2.12.57_PM.png) After: ![Screen_Shot_2016-06-16_at_2.12.38_PM](/uploads/be17e723b9c9bbe33099d1f0e94192d0/Screen_Shot_2016-06-16_at_2.12.38_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [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) cc: @jschatz1 See merge request !4719
| * | Add merge request data to the progress information on Milestones pages.milestones-show-mrsConnor Shea2016-06-161-0/+7
| | | | | | | | | | | | Fixes #13980.
* | | Merge branch 'comment-form-button-spacing' into 'master' Jacob Schatz2016-06-183-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed alignment of buttons in note forms ## What does this MR do? Due to a CSS change on some buttons, the alignment of the save button on the note form went off. Also, it made no sense to have `.btn-grouped` as the button wasn't in a group. ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_11.43.33](/uploads/5d9037a48ff6179fc906bdf0c6d5ff47/Screen_Shot_2016-06-17_at_11.43.33.png) ![Screen_Shot_2016-06-17_at_11.43.43](/uploads/8b130a25e8f73e79578d38f5f7aff4fb/Screen_Shot_2016-06-17_at_11.43.43.png) See merge request !4740
| * | | Fixed alignment of buttons in note formscomment-form-button-spacingPhil Hughes2016-06-173-4/+4
| | | |
* | | | Merge branch 'dz-organize-admin-settings' into 'master' Jacob Schatz2016-06-183-64/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin->runners tab as subnav of overview tab cc @annabeldunstone See merge request !4716
| * | | | Move admin->runners tab as subnav of overview tabdz-organize-admin-settingsDmitriy Zaporozhets2016-06-163-64/+70
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'tags-edit-tooltip-placement' into 'master' Jacob Schatz2016-06-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed tooltip placement on edit tags button ## What does this MR do? Moves the placement of the tooltip to the body so not to affect the movement of the button. ## Screenshots (if relevant) Old: ![tooltip-old](/uploads/9ecb9bb919578881994698cd8b1d1826/tooltip-old.gif) New: ![tooltip-new](/uploads/66f90cf95c2ee4001bfa3c65b9de8c05/tooltip-new.gif) See merge request !4737
| * | | | | Fixed tooltip placement on edit tags buttontags-edit-tooltip-placementPhil Hughes2016-06-171-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'branch-buttons-size' into 'master' Jacob Schatz2016-06-181-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed size of buttons in branches list ## What does this MR do? The buttons on the branch list were using `btn-xs` this MR removes that so the buttons are a normal size to match https://gitlab.com/gitlab-org/gitlab-ce/tags ## What are the relevant issue numbers? #18677 ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_10.38.31](/uploads/19fc173e3f549a84bb14517613403792/Screen_Shot_2016-06-17_at_10.38.31.png) See merge request !4735
| * | | | | Fixed size of buttons in branches listbranch-buttons-sizePhil Hughes2016-06-171-3/+3
| |/ / / / | | | | | | | | | | | | | | | Closes #18677
* | | | | Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-178-25/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1759-774/+945
| |\ \ \ \ \
| * | | | | | Allow users to set custom notifications in projects they don't own and ↵Felipe Artur2016-06-177-44/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-171-1/+1
| | | | | | |
| * | | | | | 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-178-37/+78
| |\ \ \ \ \ \
| | * | | | | | Re-use notifications dropdown on user profileFelipe Artur2016-06-169-44/+50
| | | | | | | |
| | * | | | | | Refactor custom notifications controller code and add specsFelipe Artur2016-06-141-2/+2
| | | | | | | |
| | * | | | | | Remove schema from branch historyFelipe Artur2016-06-133-10/+56
| | | | | | | |
| * | | | | | | Added description to custom option in notification dropdownPhil Hughes2016-06-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always shows the custom option in the dropdown
| * | | | | | | Implement custom notification level optionsFelipe Artur2016-06-153-10/+55
| | | | | | | |
* | | | | | | | Merge branch 'fix-18717' into 'master' Douwe Maan2016-06-172-11/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-171-9/+11
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-181-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/todos_controller.rb
| * | | | | | | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-structured controller spec Renamed issuable param to issuable_id
| * | | | | | | | Removed ID from button as frontend doesnt use anymorePhil Hughes2016-06-171-1/+1
| | | | | | | | |
| * | | | | | | | Improved manual todosPhil Hughes2016-06-171-5/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Based on feedback from !4502
* | | | | | | | Warn about admin privilege to disable GitHub WebhooksDouglas Barbosa Alexandre2016-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'commit-header' into 'master' Jacob Schatz2016-06-171-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-171-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-171-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-141-3/+7
| | | | | | | | |
* | | | | | | | | Fixed issue with assignee dropdown not selecting correctlyPhil Hughes2016-06-171-1/+1
| | | | | | | | |
* | | | | | | | | Fix clibpoard buttons on "Check out branch" modal.clipboard-buttons-fixConnor Shea2016-06-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also document the clipboard_button_with_class method. Fixes #18794.
* | | | | | | | | Merge branch '18724-dont-show-leave-project-to-group-member' into 'master' Douwe Maan2016-06-171-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show 'Leave Project' to group members ## What does this MR do? It hides the 'Leave Project' button to group members that are not explicitly a member of the project. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Because there was an issue opened! ## What are the relevant issue numbers? Fixes #18724. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [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 !4739
| * | | | | | | | | Don't show 'Leave Project' to group members18724-dont-show-leave-project-to-group-memberRémy Coutable2016-06-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master' Rémy Coutable2016-06-171-2/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sorting dropdown to tag page ## What does this MR do? Adds a sorting dropdown to the tags page just like the one on the branches page. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Clients were asking for this ## What are the relevant issue numbers? Closes #14918 ## Screenshots (if relevant) ![Captura_de_pantalla_2016-06-01_a_las_4.07.58_p.m.](/uploads/4530683ddd91d3bdbdce77748fe63f87/Captura_de_pantalla_2016-06-01_a_las_4.07.58_p.m..png) See merge request !4423
| * | | | | | | | | | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-161-2/+13
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-178-2/+124
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export project functionality This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects. - [x] members - DB data - [x] issues - [x] issue comments - [x] merge requests - [x] merge request diff - [x] merge request comments - [x] labels - [x] milestones - [x] snippets - [x] releases - [x] events - [x] commit statuses - [x] CI builds - File system data - [x] Git repository - [x] wiki - [x] uploads - [ ] ~~CI build traces~~ - [ ] ~~CI build artifacts~~ - [ ] ~~LFS objects~~ - DB configuration - [x] services - [x] web hooks - [x] protected branches - [x] deploy keys - [x] CI variables - [x] CI triggers See merge request !3114