summaryrefslogtreecommitdiff
path: root/app/views/groups
Commit message (Collapse)AuthorAgeFilesLines
* HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-311-1/+1
|
* HAMLLint: Fix `FinalNewline` offencesKushal Pandya2016-12-311-1/+1
|
* Merge branch 'dz-nested-group-misc' into 'master' Dmitriy Zaporozhets2016-12-291-0/+9
|\ | | | | | | | | Miscellaneous improvements to the nested groups feature See merge request !8308
| * Refactor nested group related codedz-nested-group-miscDmitriy Zaporozhets2016-12-291-3/+2
| | | | | | | | | | | | | | * Simplify code around group parent access check * Rename 'Nested groups' to 'Subgroups' tab at group#show page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Show nested groups tab on group pageDmitriy Zaporozhets2016-12-261-0/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add more storage statisticsMarkus Koller2016-12-211-2/+2
|/ | | | | | | | | | | | | This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on */all) and normal users (on */owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.
* Adds sort dropdown for group membersNur Rony2016-12-161-0/+1
|
* removes extra if check25106-hide-issue-mr-button-for-not-loggedinNur Rony2016-12-121-5/+4
|
* hides new MR button from not loggedin userNur Rony2016-12-121-2/+3
|
* adds check for logged in user in group issuesNur Rony2016-12-121-7/+8
|
* Updated members dropdownsPhil Hughes2016-12-071-0/+1
| | | | This ports some code over from EE to reduce conflicts
* Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-231-12/+1
|
* Merge branch '20840-getting-started-better-empty-state-for-issues-view' into ↵Jacob Schatz2016-11-221-18/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Issues empty state ## What does this MR do? Adds the empty state for the project, dashboard and group issues. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ### Filtered to show no issues (on group issues page in this case but also dashboard and projects) ![Screen_Shot_2016-11-08_at_20.55.56](/uploads/b598af4a8a5e2c9fbb859abf36e70e4b/Screen_Shot_2016-11-08_at_20.55.56.png) ### Project with no issues ![Screen_Shot_2016-11-08_at_20.57.08](/uploads/8f54fdf1b3101c46299249fa2944207d/Screen_Shot_2016-11-08_at_20.57.08.png) ![Screen_Shot_2016-11-08_at_20.57.17](/uploads/1d2d162e1d845dd05e945d8ebb1d2101/Screen_Shot_2016-11-08_at_20.57.17.png) ### Group with no projects with any issues ![Screen_Shot_2016-11-08_at_20.54.55](/uploads/f28dc2038839d5bda0eb37f37927d5db/Screen_Shot_2016-11-08_at_20.54.55.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #20840 Closes #20850 See merge request !7309
| * Added empty state svg and set up blank conditional20840-getting-started-better-empty-state-for-issues-viewLuke "Jared" Bennett2016-11-181-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new spec step Added empty state to dashboard Split empty and filtered empty states Moved empty_state icons into their own folder and DRY up empty state html Fixed failing spec Added to groups page Review changes
* | Merge branch '19205-group-header-redesign' into 'master' Annabel Dunstone Gray2016-11-111-14/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19205 Redesign group page header to match new navigation ## What does this MR do? Redesigns group page to match comps ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-08_at_12.50.53_PM](/uploads/6c958e2ab05c1a73c9a96de25490ba2b/Screen_Shot_2016-11-08_at_12.50.53_PM.png) After: ![Screen_Shot_2016-11-08_at_12.50.34_PM](/uploads/822f81df8a0f82a4bdeee3739be5d1f7/Screen_Shot_2016-11-08_at_12.50.34_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #19205 See merge request !7363
| * | 19205 Redesign group page header to match new navigation19205-group-header-redesigntauriedavis2016-11-091-14/+12
| |/
* | Require projects before creating milestonegfyoung2016-11-101-1/+1
|/
* Merge branch 'remove-wiki-image-border-radius' into 'master' Fatih Acet2016-11-042-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | Update avatar container name so it doesnt conflict with other image containers Bug from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7206 renders all wiki images circular Before: ![Screen_Shot_2016-11-03_at_9.27.45_AM](/uploads/f49baa4481cec6d6c043087aa1a83d09/Screen_Shot_2016-11-03_at_9.27.45_AM.png) After: ![Screen_Shot_2016-11-03_at_9.27.37_AM](/uploads/5b21d1752b5fa5adcabd44b8973fb55d/Screen_Shot_2016-11-03_at_9.27.37_AM.png) cc @tauriedavis @dzaporozhets See merge request !7268
| * Update avatar container name so it doesnt conflict with other image containersremove-wiki-image-border-radiusAnnabel Dunstone Gray2016-11-032-2/+2
| |
* | Merge branch '22947-fix_issues_atom_feed_url' into 'master' Rémy Coutable2016-11-042-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues atom feed url reflect filters on dashboard Makes the issue atom feed url reflect the selected filters on the issue dashboard page and project's issues page. ## Are there points in the code the reviewer needs to double check? The solution isn't based on javascript and filters functionality but on the current url parameters. It didn't seem right especially when writing tests. ## Why was this MR needed? After filtering the issues, users may press the feed button and see a different list of issues to what is shown on the HTML page Closes #22947 See merge request !7259
| * | Issues atom feed url reflect filters on dashboard22947-fix_issues_atom_feed_urlLucas Deschamps2016-11-032-3/+3
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'group-name-validation' into 'master' Alfredo Sumaran2016-11-032-2/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds JavaScript validation for group path editing ## What does this MR do? - Prevents group_edit form submission when special characters are included in the new group name - Enhances gl_field_errors to support this use case and be more re-usable. ## Are there points in the code the reviewer needs to double check? **The implementation of validation is here: https://gitlab.com/gitlab-org/gitlab-ce/commit/73d997046cac376ccdbcaac6f183002bc19b9a1f** The rest of the diff for this MR is augmenting gl_field_errors ## Why was this MR needed? - Currently we allow submission and a 500 error is returned. ## Screenshots (if relevant) ![2016-10-21_14.11.21](/uploads/2bef5764d3f2429dd0f900661153eef7/2016-10-21_14.11.21.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23564, https://gitlab.com/gitlab-org/gitlab-ce/issues/19756, https://gitlab.com/gitlab-org/gitlab-ce/issues/19736, https://gitlab.com/gitlab-org/gitlab-ce/issues/23922 See merge request !7041
| * Initialize form validation on new group form.group-name-validationBryce Johnson2016-11-021-1/+1
| |
| * Change show-gl-field-errors to gl-show-field-errorsBryce Johnson2016-11-021-1/+1
| |
| * Add gl field errors to group name edit form.Bryce Johnson2016-11-011-1/+1
| |
* | 23545 Fix distorted project and group avatarstauriedavis2016-11-012-2/+4
|/
* Use label subject to calculate number of issues/mrs within the groupDouglas Barbosa Alexandre2016-10-311-1/+1
|
* Add label type to group and project labels listsDouglas Barbosa Alexandre2016-10-191-1/+1
|
* Reduce duplication between the project and group label formsDouglas Barbosa Alexandre2016-10-193-35/+2
|
* Remove scopes/types for labelsDouglas Barbosa Alexandre2016-10-193-11/+5
|
* Remove duplication between global and the regular label partialsDouglas Barbosa Alexandre2016-10-193-60/+1
|
* List group labels on project labels pageDouglas Barbosa Alexandre2016-10-192-2/+2
|
* Add CRUD for Group LabelsDouglas Barbosa Alexandre2016-10-197-0/+135
|
* Merge branch 'members-ui' into 'master' Fatih Acet2016-10-143-44/+35
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project members UI ## What does this MR do? New UI for project members that includes groups. ## Screenshots (if relevant) ### Project members ![Screen_Shot_2016-09-02_at_15.13.27](/uploads/b9d4a634d44b7b7bbb6eddb10aee86bd/Screen_Shot_2016-09-02_at_15.13.27.png) ### Group members ![Screen_Shot_2016-09-02_at_15.13.36](/uploads/c15c173e68b2c0b49bcd06ca560269d3/Screen_Shot_2016-09-02_at_15.13.36.png) ## What are the relevant issue numbers? Part of #19868 Closes #21320 See merge request !6148
| * Merge branch 'master' into members-uiPhil Hughes2016-10-061-2/+2
| |\
| * \ Merge branch 'master' into members-uiPhil Hughes2016-10-043-1/+14
| |\ \
| * | | CSS cleanupPhil Hughes2016-09-132-2/+2
| | | |
| * | | Updated groups member UI to matchPhil Hughes2016-09-132-42/+33
| | | |
| * | | Mobile improvementsPhil Hughes2016-09-131-2/+2
| | | | | | | | | | | | | | | | | | | | Added group name to members row Fixed saving group member
* | | | Enable CacheMarkdownField for the remaining modelsNick Thomas2016-10-071-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit alters views for the following models to use the markdown cache if present: * AbuseReport * Appearance * ApplicationSetting * BroadcastMessage * Group * Issue * Label * MergeRequest * Milestone * Project At the same time, calls to `escape_once` have been moved into the `single_line` Banzai pipeline, so they can't be missed out by accident and the work is done at save, rather than render, time.
* | | Don't include archived projects when creating group milestonesJeroen Jacobs2016-10-051-2/+2
| |/ |/|
* | Merge branch '20310-new-project-btn' into 'master' Jacob Schatz2016-09-211-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix new project button alignment ## What does this MR do? Increases the width of the button/search container to fit all items at smaller screen width. The left side of the row can only have a max of two tabs (All Projects, Shared Projects), so everything can still fit on one line until they resize for mobile ## Why was this MR needed? The `New project` button wrapped to next line at smaller screen width, breaking the layout ## Screenshots (if relevant) ![Screen_Shot_2016-09-09_at_11.44.27_AM](/uploads/a726208deec6623d9fb62db0a549bf38/Screen_Shot_2016-09-09_at_11.44.27_AM.png) ![Screen_Shot_2016-09-09_at_11.46.29_AM](/uploads/bd8dc911757b14c5fafc4d3849e0b242/Screen_Shot_2016-09-09_at_11.46.29_AM.png) ## What are the relevant issue numbers? Closes #20310 See merge request !6286
| * | Fix new project button alignment20310-new-project-btnAnnabel Dunstone Gray2016-09-141-1/+1
| |/
* | Syntax fixes and better tests for helper methods. Updated docs.group-specific-lfs-settingsPatricio Cano2016-09-152-1/+12
| |
* | Added group-specific setting for LFS.Patricio Cano2016-09-151-0/+2
|/ | | | Groups can enable/disable LFS, but this setting can be overridden at the project level. Admin only
* Fix expiration date picker after updateSean McGivern2016-09-021-1/+1
|
* change from members using size to start using total_count in the group20909-use-total-count-instead-of-sizetiagonbotelho2016-08-241-1/+1
| | | | members page
* Add descriptionsDouwe Maan2016-08-181-0/+2
|
* Add expiration date to group membershipsSean McGivern2016-08-182-0/+8
|
* Add light border to rounded avatarsdz-avatar-borderDmitriy Zaporozhets2016-07-221-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>