summaryrefslogtreecommitdiff
path: root/app/views/layouts
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dz-organize-admin-settings' into 'master' Jacob Schatz2016-06-181-5/+1
|\ | | | | | | | | | | | | 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-161-5/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | 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 remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-1611-129/+122
|\ \ | |/
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-06-169-128/+96
| |\ | | | | | | | | | | | | | | | | | | category-search-dropdown # Conflicts: # app/assets/javascripts/lib/common_utils.js.coffee
| | * Merge branch 'pinned-sidebar' into 'master' Jacob Schatz2016-06-153-6/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pinned sidebar navigation option ## What does this MR do? Gives the ability to pin the sidebar navigation. Pinning is only possible on screens with above `lg` which is `1200px` if not it reverts to being hidden by default. ## What are the relevant issue numbers? Closes #18542 ## Screenshots (if relevant) ### Un-pinned ![Screen_Shot_2016-06-15_at_17.29.08](/uploads/82b7495df6ea46a2334a7c25d03b019b/Screen_Shot_2016-06-15_at_17.29.08.png) ### Pinned ![Screen_Shot_2016-06-15_at_17.29.41](/uploads/3eb381be807985d0a9583f000cb802f9/Screen_Shot_2016-06-15_at_17.29.41.png) See merge request !4683
| | | * Moved pinned button to the bottomPhil Hughes2016-06-152-6/+5
| | | | | | | | | | | | | | | | Changed breakpoint width to 1440px
| | | * Pinned sidebar navigation optionPhil Hughes2016-06-153-6/+10
| | | | | | | | | | | | | | | | Closes #18542
| | * | Rearrange order of tabsAnnabel Dunstone2016-06-151-4/+4
| | | |
| | * | Move builds tab to admin overviewAnnabel Dunstone2016-06-151-5/+1
| | | |
| | * | Add monitoring link with subtabsAnnabel Dunstone2016-06-151-11/+4
| | | |
| | * | Add sub links to overviewAnnabel Dunstone2016-06-151-14/+2
| | | |
| | * | Add counter for abuse reportsAnnabel Dunstone2016-06-151-0/+1
| | | |
| | * | Remove admin layout-nav countersAnnabel Dunstone2016-06-151-4/+0
| | | |
| | * | Move admin nav to horizontal layout navAnnabel Dunstone2016-06-152-21/+4
| | |/
| | * Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-151-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add environments and deployments This MR is a continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/17009. The current implementation is as follow: 1. We have two new tables: `environments` and `deployments`. 2. We have a new tab: `Environments` under `Pipelines` where you can see all you environments and add a new one. 3. We add a new option to `.gitlab-ci.yml` to track where we should create a deployment for environment. 4. If environment in `.gitlab-ci.yml` is specified it will create a deployment. **If environment does not exist it will be created.** (this got changed) 5. The deployment is always successful and shows the time of the action, in that case a build that presumably should do deployment. In the future we could extend deployment with statuses: success, failure. We could extend deployments with information that this is partial or full deployment. 6. User have to create environments that he will track first. 7. User can remove environments. 8. User can retry/rollback past deployment (in that case we retry past build). The new build when succeeds it will create a new deployment. 9. Currently environment have only one parameter: `name`. In the future it should have: `variables`, `credentials` and possibly `runners` and maybe other resources. 10. Currently deployment have this parameters: `sha`, `ref`, `deployable (in this case a build)`, `user (who triggered a deployment)`, `created_at`. The `.gitlab-ci.yml`: ``` deploy to production: stage: deploy script: dpl travis... environment: production ``` What needs to be done: - [x] Write initial implementation - [x] Improve implementation (@ayufan) - [x] Write tests (@ayufan) - [x] Improve UX of the forms (cc @markpundsack) - reviewed by @markpundsack - [x] Improve implementation of the views (cc @jschatz1) - done by @iamphill - [x] Write .gitlab-ci.yml documentation for `environments` - done by @ayufan - [ ] Write user documentation (@ayufan and @markpundsack) See merge request !4605
| | | * Improve design after reviewKamil Trzcinski2016-06-141-1/+1
| | | |
| | * | Merge branch 'fix-header-logo-link' into 'master' Jacob Schatz2016-06-151-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the logo in header not being an anchor link. ## What does this MR do? Adds an actual link to the Tanuki in the header instead of a `Turbolinks.visit()`. ## Are there points in the code the reviewer needs to double check? Do we care that this reverts the Safari issue fixed in !2690? I feel bad, but it's hacky and there's not a great way to fix it here. ## Why was this MR needed? You couldn't open the home page in a new tab before, it was very annoying. ## What are the relevant issue numbers? Fixes #18604 cc: @rspeicher See merge request !4661
| | | * | Fix #18604, logo in header wasn't an anchor link.fix-header-logo-linkConnor Shea2016-06-141-1/+1
| | | | |
| | * | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-141-3/+2
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| | | * | Manually create todo for issuablePhil Hughes2016-06-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-39/+40
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | # 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
| | | | |
| | * | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-142-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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>
| | * | | Add request access for groupsRémy Coutable2016-06-142-36/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | Initial implementation of user access request to projectsDavid Alexander2016-06-141-0/+18
| | |/ /
| * | | Escape JavaScript in haml template.category-search-dropdownFatih Acet2016-06-141-6/+6
| | | |
| * | | Defensive check for the group options.Fatih Acet2016-06-131-1/+1
| | | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-06-1310-93/+52
| |\ \ \ | | |/ / | | | | | | | | category-search-dropdown
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-06-096-49/+47
| |\ \ \ | | | | | | | | | | | | | | | category-search-dropdown
| * | | | Inject group options.Fatih Acet2016-06-092-2/+12
| | | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-06-083-29/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | category-search-dropdown
| * | | | | Added projectOptions and dashboardOptions into gl object.Fatih Acet2016-06-071-0/+15
| | | | | |
| * | | | | Added data-project attribute to body tag.Fatih Acet2016-06-071-1/+1
| | | | | |
* | | | | | Implement @DouweM's feedback.Timothy Andrew2016-06-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Extract a duplicated `redirect_to` - Fix a typo: "token", not "certificate" - Have the "Expires at" datepicker be attached to a text field, not inline - Have both private tokens and personal access tokens verified in a single "authenticate_from_private_token" method, both in the application and API. Move relevant logic to `User#find_by_personal_access_token` - Remove unnecessary constants relating to API auth. We don't need a separate constant for personal access tokens since the param is the same as for private tokens.
* | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-1410-93/+52
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | 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
| | | | | |
| * | | | | Move tanuki icon to center of nav bar; keep nav closed by default; remove ↵Annabel Dunstone2016-06-103-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | collapsed nav cookie
| * | | | | Render only issues/mr in subnav depends on contextDmitriy Zaporozhets2016-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>