Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-06-22Merge branch ↵Douwe Maan
'18871-check-improve-how-we-display-access-requesters-in-admin-area' into 'master' Display group/project access requesters separately in admin ## What does this MR do? It displays the access requesters in a separate list in group & project members pages. It also harmonize the members counter UI to use `%span.badge` everywhere (in the admin & non-admin members views). ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? To not confuse access requesters with actual members. ## What are the relevant issue numbers? Closes #18871. ## Screenshots ### Group members | Before | After | | --------- | ---- | | ![group-members-before](/uploads/2f15137e073fd3a63bc2cb7b2217cb6c/group-members-before.png) | ![group-members-after](/uploads/5b643974505cfa57783fa0320d3bf8b2/group-members-after.png) | ### Project members | Before | After | | --------- | ---- | | ![project-members-before](/uploads/9c48dcd3736e42de84061b1201ee0b06/project-members-before.png) | ![project-members-after](/uploads/8e04c92ef0bba3de7e2405618632b27d/project-members-after.png) | ### Admin group members | Before | After | | --------- | ---- | | ![admin-group-members-before](/uploads/7fda8c2c94b697bea6655ba892ba45e7/admin-group-members-before.png) | ![admin-group-members-after](/uploads/ea25717001794f75939c679b80308c3a/admin-group-members-after.png) | ### Admin project members | Before | After | | --------- | ---- | | ![admin-project-members-before](/uploads/ba9d3ec52adbda6bb3d45ad9ac5243d3/admin-project-members-before.png) | ![admin-project-members-after](/uploads/3b889a029a9756e9ed2781b45c4dd9cb/admin-project-members-after.png) | ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since this is related to the original "request access" MR. - [ ] 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 !4798 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-17Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master' Douwe Maan
Fix permission checks in member row (backport from gitlab-org/gitlab-ee!460) ## What does this MR do? It improves the check we use to display or not the members' access and controls in the members list. ## Are there points in the code the reviewer needs to double check? No, I replaced an helper with just a permission check so I think it's a better solution. ## Why was this MR needed? There were a spec failure in gitlab-org/gitlab-ee!460 because of the refactor done in the "request access" MR. ## What are the relevant issue numbers? None. ## Does this MR meet the acceptance criteria? - No CHANGELOG needed - [x] Tests - [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 !4670
2016-06-14UI and copywriting improvementsRémy Coutable
+ 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>
2016-06-14Add request access for groupsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10Don't try to count a relation with aliasesSean McGivern
98f147e84d2bd8f2278452ac0852118452c76d4a fixed this for issues in HTML, but not MRs or Atom feeds.
2016-06-10Merge branch 'dz-improve-ui-consistency-2' into 'master' Jacob Schatz
Improve ui consistency. Part 2 * Use responsive top-area on project branches and tags pages * Use default button size in the content list controls * Improve button margin for btn-grouped css class For https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 See merge request !4536
2016-06-09Improved the UX of issue & milestone date pickerPhil Hughes
Closes #18198
2016-06-09Merge branch '18333-layout-bug' into 'master' Jacob Schatz
Use container helper instead of hard coded container ## What does this MR do? Add `container_class` helper class to fix layout bug ## What are the relevant issue numbers? #18333 ## Screenshots (if relevant) Fixed: ![Screen_Shot_2016-06-08_at_2.03.38_PM](/uploads/6e7575d711efb8eaf6ba641907b2d607/Screen_Shot_2016-06-08_at_2.03.38_PM.png) Fluid: ![Screen_Shot_2016-06-08_at_2.03.56_PM](/uploads/33d3f73781ca9ed129f853abfe9feb4b/Screen_Shot_2016-06-08_at_2.03.56_PM.png) See merge request !4543
2016-06-08Use container helper instead of hard coded containerAnnabel Dunstone
2016-06-08Improve button margin for btn-grouped css classDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08Remove unnecessary icons from buttonsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-25Merge branch 'rs-remove-issue_to_atom' into 'master' Douwe Maan
Remove `issue_to_atom` helper See merge request !4265
2016-05-24Remove `issue_to_atom` helperRobert Speicher
2016-05-23Remove `event_to_atom` helperRobert Speicher
2016-05-18Link to group feed from group activity pageSean McGivern
2016-05-18Point group's issues atom feed to groupSean McGivern
This was using the user dashboard atom builder template, not one for the group's issues.
2016-05-06Merge branch 'group-navigation-redesign' into 'master' Dmitriy Zaporozhets
Redesign navigation for group pages Part of #14838. This MR targets on desktop version. Mobile version improvements will be in separate merge request See merge request !3980
2016-05-05Start builds redesignAnnabel Dunstone
2016-05-04Update font colors, font sizes, caret icon, avatar sizeAnnabel Dunstone
2016-05-04Fixed layout nav, revert back to badge styles, general enhancementsAnnabel Dunstone
2016-05-03Redesign profile page and group page mobile navigationAnnabel Dunstone
2016-05-03Group navigation design updateAnnabel Dunstone
2016-04-28Redesign navigation for group pagesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-14Fixed group milestones placeholder bugPhil Hughes
2016-04-14Milestones use new GLForm classPhil Hughes
2016-04-11Merge branch 'rs-form_errors' into 'master' Dmitriy Zaporozhets
Standardize the way we check for and display form errors - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard. See merge request !3531
2016-04-05Improve codeFelipe Artur
2016-04-05Standardize the way we check for and display form errorsRobert Speicher
- Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard.
2016-03-23Merge branch 'fix_missing_tooltip_next_to_project_title' into 'master' Jacob Schatz
Fix missing tooltip in project title closes #14516 ![tooltip](/uploads/121cc3676f4f32044e158cf5f3df5be5/tooltip.gif) See merge request !3351
2016-03-23fix missing tooltip in project titleArinde Eniola
2016-03-22Merge branch 'issue_13885' into 'master' Jacob Schatz
Display nav controls on mobile Set inputs inside .nav-controls to full-width on viewports below 600px Fixes #13885 **Affected pages** /dashboard/groups /admin/builds /dashboard/projects /dashboard/issues /dashboard/merge_requests /dashboard/milestones /dashboard/todos /explore /groups/{group-name}/issues /groups/{group-name} /groups/{group-name}/milestones /{group-name}/{project-name}/builds /{group-name}/{project-name}/forks /{group-name}/{project-name}/issues /{group-name}/{project-name}/labels /{group-name}/{project-name}/merge_requests /{group-name}/{project-name}/milestones /{group-name}/{project-name}/wikis/home /{group-name}/{project-name}/wikis/pages Some Screenshots **Groups** ![Screen_Shot_2016-03-15_at_2.22.23_PM](/uploads/b55348676693cc3ff67cddc4528f7f6c/Screen_Shot_2016-03-15_at_2.22.23_PM.png) **Admin > Builds** ![admin-builds](/uploads/2e84119660f4895a1530883412c4b728/admin-builds.png) **TODOs** ![todos](/uploads/84344c43011e22f902701038932d3eaa/todos.png) **Dashboard > Projects** ![dashboards-projects](/uploads/f508d9107598038798aa10485d3d5cfe/dashboards-projects.png) **Project Issues** ![issues](/uploads/d6c69a8f81ee07da95b2a3b99b81cf51/issues.png) **Project Merge Requests** ![merge_requests](/uploads/b3c1a537f28931bd38077c36627a0d7a/merge_requests.png) See merge request !3214
2016-03-22Address feedbackDouwe Maan
2016-03-20Tweaks, refactoring, and specsDouwe Maan
2016-03-18Improve group visibility level featureZeger-Jan van de Weg
2016-03-18Add missing labelAlfredo Sumaran
2016-03-18Code fixesFelipe Artur
2016-03-17Merge 4009-external-users into issue_12658Felipe Artur
2016-03-17Code improvements and add Create group serviceFelipe Artur
2016-03-14Redesign project tabs on group pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-14Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets
Bring from EE: Share Project with Group - [x] Models and migrations - [x] Logic, UI - [x] Tests - [x] Documentation - [x] Share with group lock - [x] Api feature - [x] Api docs - [x] Api tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #12831 cc @DouweM @rspeicher @vsizov See merge request !3186
2016-03-11Add share project from group lockDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11Show shared projects on group pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10Prevent projects to have higher visibility than groupsFelipe Artur
Prevent Groups to have smaller visibility than projects Add default_group_visibility_level to configuration Code improvements
2016-03-10Add permission level to groupsFelipe Artur
2016-03-10Fix header titleDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10Move group activity feed to separate page for consistency with dashboard and ↵Dmitriy Zaporozhets
project pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-09Merge branch 'improve-archived-projects'Dmitriy Zaporozhets
2016-03-07Updates from last code review.Rubén Dávila
2016-03-05Show some stats about Milestone according to the new UI.Rubén Dávila
2016-03-05Make Merge Requests tab have the same look as Issues.Rubén Dávila