Age | Commit message (Collapse) | Author |
|
'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>
|
|
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
|
|
+ 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>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
98f147e84d2bd8f2278452ac0852118452c76d4a fixed this for issues in HTML,
but not MRs or Atom feeds.
|
|
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
|
|
Closes #18198
|
|
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
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Remove `issue_to_atom` helper
See merge request !4265
|
|
|
|
|
|
|
|
This was using the user dashboard atom builder template, not one for the
group's issues.
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
|
|
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
|
|
|
|
- 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.
|
|
Fix missing tooltip in project title
closes #14516
![tooltip](/uploads/121cc3676f4f32044e158cf5f3df5be5/tooltip.gif)
See merge request !3351
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
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
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Prevent Groups to have smaller visibility than projects
Add default_group_visibility_level to configuration
Code improvements
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
|
|
|
|
|