Commit graph

20 commits

Author SHA1 Message Date
tauriedavis
b4056e1b0d 31853 Remove duplication for sharing projects with groups in project settings 2017-06-08 08:48:59 -05:00
tauriedavis
024427bff6 31689 Add default margin-top to user request table on project members page 2017-05-04 15:17:16 -07:00
Dmitriy Zaporozhets
6676b4f0dd
Use Namespace#full_path instead of Namespace#path
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-02-14 18:38:20 +02:00
Jose Ivan Vargas
8f4f04c238 Fixed es6 lint errors, and reverted a change to a helper 2017-01-03 12:55:36 -06:00
Jose Ivan Vargas
075aae2503 Updated the "users" to "members" matches in the view
Reverted the change from the "expires_at" to "expires_at_groups" in the groups controller
2017-01-03 10:52:14 -06:00
Jose Ivan Vargas
ad58dec2e1 Added groups to members section, added a members finder 2017-01-03 10:52:14 -06:00
Phil Hughes
1637ce4e6a Updated JS based on review
Fixed group links dropdown to match
2016-12-09 10:06:02 +00:00
Fatih Acet
66855f6262 Merge branch 'members-ui' into 'master'
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
2016-10-14 12:25:23 +00:00
Phil Hughes
6865c46c66 Changed how collections are rendered
Used variables in haml for replicated checks
Fixed broken conflict
2016-10-06 15:41:00 +01:00
Phil Hughes
996e802415 Merge branch 'master' into members-ui 2016-10-06 15:30:34 +01:00
Clement Ho
e23c1d88e2 Replace bootstrap caret with fontawesome caret 2016-10-05 17:39:52 -05:00
barthc
35ced4dae4 fix group links 404 2016-10-05 09:57:54 +01:00
Phil Hughes
ecf7640b28 Fixed group_links expire date not updating in view 2016-09-13 08:44:59 +01:00
Phil Hughes
4afd17b278 Included groups on project_members page 2016-09-13 08:44:59 +01:00
Douwe Maan
473db1f974 Add descriptions 2016-08-18 19:44:09 -05:00
Sean McGivern
883b96ab6a Allow project group links to be expired 2016-08-18 22:45:41 +01:00
Phil Hughes
ca988b2be7 Fixed failing tests 2016-04-25 16:56:17 +01:00
Phil Hughes
172947f366 Updated select box to match design 2016-04-25 14:55:03 +01:00
Phil Hughes
5542c9456c Updated project group sharing UI
Closes #13991
2016-04-25 14:42:17 +01:00
Dmitriy Zaporozhets
746ac56b6f
Add functionality to setup share of project with group via project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11 18:37:46 +01:00