summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-142-4/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually create todo for issuable ## What does this MR do? Adds a button to the sidebar in issues & merge requests to allow users to manually create a todo item themselves. ## What are the relevant issue numbers? Closes #15045 ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_09.52.14](/uploads/00af70244c0589d19f241c3e85f3d63d/Screen_Shot_2016-06-07_at_09.52.14.png) ![Screen_Shot_2016-06-07_at_09.52.06](/uploads/e232b02208613a4a50cff4d1e6f119ff/Screen_Shot_2016-06-07_at_09.52.06.png) ![Screen_Shot_2016-06-07_at_09.51.14](/uploads/f1d36435d49ab882538ae2252bec8086/Screen_Shot_2016-06-07_at_09.51.14.png) See merge request !4502
| * Returns created todos to control rather than re-queryPhil Hughes2016-06-141-1/+1
| |
| * Uses update URL to update the status of a todoPhil Hughes2016-06-141-1/+1
| |
| * Moved todo creation over to project todos controllerPhil Hughes2016-06-141-1/+1
| |
| * Cached jQuery selectorsPhil Hughes2016-06-141-5/+4
| |
| * Fixed bug with sidebar when user is not logged inPhil Hughes2016-06-141-10/+12
| |
| * Fixed issue with sidebar button stylingPhil Hughes2016-06-141-1/+1
| |
| * Manually create todo for issuablePhil Hughes2016-06-142-4/+14
| | | | | | | | | | | | Added a button into the sidebar for issues & merge requests to allow users to manually create todo items Closes #15045
* | Merge branch '18539-nav-alignment' into 'master' Jacob Schatz2016-06-141-10/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put all sidebar icons in fixed width container ## What does this MR do? Puts all icons (font awesome and custom) in fixed width container to fix weird alignment ## Why was this MR needed? Mix of font awesome icons & custom icons results in different icon widths ## What are the relevant issue numbers? Closes #18539 ## Screenshots (if relevant) <img src="/uploads/94a82258d5d71df0b9608ccd4d7e5cd1/Screen_Shot_2016-06-14_at_9.57.25_AM.png" width="400px"> See merge request !4648
| * | Put all sidebar icons in fixed width containerAnnabel Dunstone2016-06-141-10/+20
| | |
* | | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-143-47/+62
|\ \ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/nav/_project.html.haml
| * \ \ Merge branch 'settings-dropdown-permissions' into 'master' Dmitriy Zaporozhets2016-06-142-49/+50
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix displaying of project settings links the user cannot access. ## What does this MR do? It fixes the Project Settings dropdown displaying project settings links that the user cannot actually access. ## Are there points in the code the reviewer needs to double check? I've tested combinations I can think of, feel free to mess around with and see if it breaks? ## Why was this MR needed? Users were seeing links in the Project Settings dropdown that they shouldn't have seen, if they clicked them they would be shown permission errors. ## What are the relevant issue numbers? #18294 ## Screenshots (if relevant) Users without any permissions: ![Screen_Shot_2016-06-10_at_10.41.27_AM](/uploads/b70ca18a36b5f774b85694d8f1728882/Screen_Shot_2016-06-10_at_10.41.27_AM.png) Guest members of the project: ![Screen_Shot_2016-06-10_at_10.48.36_AM](/uploads/a37986b4daa789063661c2fa8cf59d43/Screen_Shot_2016-06-10_at_10.48.36_AM.png) Full permissions: ![Screen_Shot_2016-06-10_at_10.41.57_AM](/uploads/4c5cc97962e69a1a72ee8e237591ec22/Screen_Shot_2016-06-10_at_10.41.57_AM.png) cc: @dzaporozhets @annabeldunstone @jschatz1 See merge request !4599
| | * | | Pass can_edit and access to partial.Connor Shea2016-06-132-3/+1
| | | | |
| | * | | Fix a bug that allowed Guests to still see Settings links they couldn't access.Connor Shea2016-06-101-1/+2
| | | | |
| | * | | Fix displaying of project settings links the user cannot access.Connor Shea2016-06-102-48/+50
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-143-5/+21
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fix keep action of build artifacts widgetKamil Trzcinski2016-06-131-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-131-1/+1
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-134-30/+4
| |\ \ \ \ \
| * | | | | | Fixed spacing with row below in build sidebarPhil Hughes2016-06-131-1/+1
| | | | | | |
| * | | | | | Added missing span element around timePhil Hughes2016-06-131-3/+3
| | | | | | |
| * | | | | | Allow to show the time in the futureKamil Trzcinski2016-06-131-4/+7
| | | | | | |
| * | | | | | Show the artifacts expiration prompt in Build Artifacts widgetKamil Trzcinski2016-06-131-17/+18
| | | | | | |
| * | | | | | Move keep to ArtifactsControllerKamil Trzcinski2016-06-131-9/+10
| | | | | | |
| * | | | | | Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+9
| | | | | | |
* | | | | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-1433-151/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Factorize members mails into a new Emails::Members moduleRémy Coutable2016-06-1428-63/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Add request access for groupsRémy Coutable2016-06-1436-230/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Initial implementation of user access request to projectsDavid Alexander2016-06-148-3/+68
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'confidential-issues-in-private-projects' into 'master' Douwe Maan2016-06-141-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to create confidential issues in private projects Closes #14787 ## What does this MR do? Allow users to create confidential issues in private projects, and exclude access to them to project members with `Guest` role. ## Are there points in the code the reviewer needs to double check? The query generated by the `User#authorized_projects` method. ## Why was this MR needed? Community have been requesting this feature. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/14787 https://gitlab.com/gitlab-org/gitlab-ce/issues/3678 ## Screenshots (if relevant) Not relevant. ## Todo - [x] Allow users to create confidential issues in private projects - [x] Project members with `Guest` role should not have access to confidential issues - [ ] ~~Apply changes in EE + Elasticsearch~~ Will be done in another MR, when this got merged See merge request !3471
| * | | | | | Project members with guest role can't access confidential issuesDouglas Barbosa Alexandre2016-06-131-1/+1
| | | | | | |
| * | | | | | Allow users to create confidential issues in private projectsDouglas Barbosa Alexandre2016-06-131-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'issue_14572' into 'master' Rémy Coutable2016-06-141-1/+19
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more information into RSS feed for issues ## What does this MR do? This MR adds issue text, labels , milestone, assignee and due date into issues RSS feed. ## Are there points in the code the reviewer needs to double check? #14572 requests to add 'weight' among other fields. Seems like issue weight is available in enterprise edition only so it is not implemented in this MR. Please correct me if I'm wrong. ## Why was this MR needed? This MR is needed because it extends issues RSS feed with useful information requested in #14572. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/14572 See merge request !4158
| * | | | | Add more information into RSS fead for issuesAlexander Matyushentsev2016-06-131-1/+19
| | |_|/ / | |/| | |
* | | | | Merge branch 'dz-cleanup-counters' into 'master' Dmitriy Zaporozhets2016-06-131-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove counters from Pipeline navigation * counters are heavy from UI perspective * duplicates information from tabs below * shows 0 for less active projects. Jumps from 0 to N constantly. I think we should render counters only when necessary and only for filters ( tabs on white bg ). Exception: issues, merge requests in top navigation as status of project popularity and action required from maintainers cc @grzesiek @ayufan @jschatz1 See merge request !4617
| * | | | Remove counters from Pipeline navigationdz-cleanup-countersDmitriy Zaporozhets2016-06-131-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-related-branches-error-500' into 'master' Kamil Trzciński2016-06-131-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix typo causing related branches to Error 500 From Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/6154/ See merge request !4611
| * | | | Fix typo causing related branches to Error 500fix-related-branches-error-500Stan Hu2016-06-121-1/+1
| |/ / /
* | | | Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' Rémy Coutable2016-06-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show branches for revert / cherry-pick ## What does this MR do? Stop showing tags in the revert and cherry-pick select options. You can't change a tag anyway. ## Are there points in the code the reviewer needs to double check? Uncertain. ## Why was this MR needed? Showing tags doesn't make any sense and will just throw an exception if the user tries to cherry-pick or revert onto a tag. ## What are the relevant issue numbers? Fixes #18377. ## Screenshots (if relevant) On the GitLab CE repo: ![image](/uploads/9c5a6f09300a7c46d0a794bef2956992/image.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] Added for this feature/bug - [ ] 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 !4596
| * | | | Only show branches for revert / cherry-pick18377-cherry-pick-crashes-when-choosing-a-tagSean McGivern2016-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Tags are immutable, so we can't add a commit to either revert or cherry-pick another commit to them.
* | | | | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-133-29/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove notification level from user model part of #3359 See merge request !4494
| * | | | Remove notification level from user modelFelipe Artur2016-06-103-29/+3
| |/ / /
* | | | Merge branch ↵Rémy Coutable2016-06-135-9/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '18446-when-this-merge-request-is-accepted-this-issue-will-be-closed-automatically-rendered-twice' into 'master' Resolve ""When this merge request is accepted, this issue will be closed automatically" rendered twice" ## What does this MR do? 1. Only show the above text when there is an MR that will close the issue, and even then, only show it once. 2. Apply 98f147e84d2bd8f2278452ac0852118452c76d4a to a bunch of other places that need it. ## Are there points in the code the reviewer needs to double check? ¯\_(ツ)_/¯ ## Why was this MR needed? Some pages were broken. ## What are the relevant issue numbers? Fixes #18446. ## Screenshots (if relevant) Before: ![image](/uploads/23cfaf95b7c798f22963ff67f78a803b/image.png) After: ![image](/uploads/ca9c538069ba52e53858c69387738521/image.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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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 !4594
| * | | Don't try to count a relation with aliases18446-when-this-merge-request-is-accepted-this-issue-will-be-closed-automatically-rendered-twiceSean McGivern2016-06-104-7/+7
| | | | | | | | | | | | | | | | | | | | 98f147e84d2bd8f2278452ac0852118452c76d4a fixed this for issues in HTML, but not MRs or Atom feeds.
| * | | Only show issues closing MR when presentSean McGivern2016-06-101-2/+0
| |/ /
* | | Center layout navigation and remove iconsnav-offscreen-dz-patchDmitriy Zaporozhets2016-06-114-27/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix preferences_spec test18417-nav-offscreenAnnabel Dunstone2016-06-101-1/+1
| | |
* | | Add back sidebar counters and usernameAnnabel Dunstone2016-06-104-3/+12
| | |
* | | Revert side nav to full width; remove border under nav; remove tooltips on ↵Annabel Dunstone2016-06-106-44/+35
| | | | | | | | | | | | nav links; stop page content shifting with side nav; put project nav in container
* | | Fix logo at all screen widths, update sidebar textAnnabel Dunstone2016-06-101-2/+2
| | |