-
- Downloads
Merge branch 'share-project-ce' into 'master'
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
No related branches found
No related tags found
Showing
- app/assets/javascripts/dispatcher.js.coffee 2 additions, 0 deletionsapp/assets/javascripts/dispatcher.js.coffee
- app/controllers/groups_controller.rb 3 additions, 1 deletionapp/controllers/groups_controller.rb
- app/controllers/projects/group_links_controller.rb 23 additions, 0 deletionsapp/controllers/projects/group_links_controller.rb
- app/controllers/projects/project_members_controller.rb 1 addition, 0 deletionsapp/controllers/projects/project_members_controller.rb
- app/finders/projects_finder.rb 2 additions, 1 deletionapp/finders/projects_finder.rb
- app/models/group.rb 2 additions, 0 deletionsapp/models/group.rb
- app/models/project.rb 6 additions, 0 deletionsapp/models/project.rb
- app/models/project_group_link.rb 36 additions, 0 deletionsapp/models/project_group_link.rb
- app/models/project_team.rb 51 additions, 1 deletionapp/models/project_team.rb
- app/models/user.rb 2 additions, 1 deletionapp/models/user.rb
- app/views/admin/groups/show.html.haml 16 additions, 0 deletionsapp/views/admin/groups/show.html.haml
- app/views/groups/_shared_projects.html.haml 18 additions, 0 deletionsapp/views/groups/_shared_projects.html.haml
- app/views/groups/edit.html.haml 9 additions, 0 deletionsapp/views/groups/edit.html.haml
- app/views/groups/show.html.haml 7 additions, 0 deletionsapp/views/groups/show.html.haml
- app/views/layouts/nav/_project_settings.html.haml 6 additions, 0 deletionsapp/views/layouts/nav/_project_settings.html.haml
- app/views/projects/group_links/index.html.haml 41 additions, 0 deletionsapp/views/projects/group_links/index.html.haml
- app/views/projects/project_members/_shared_group_members.html.haml 21 additions, 0 deletions.../projects/project_members/_shared_group_members.html.haml
- app/views/projects/project_members/index.html.haml 3 additions, 0 deletionsapp/views/projects/project_members/index.html.haml
- config/routes.rb 2 additions, 0 deletionsconfig/routes.rb
- db/migrate/20130711063759_create_project_group_links.rb 10 additions, 0 deletionsdb/migrate/20130711063759_create_project_group_links.rb
Loading
Please register or sign in to comment