 Dmitriy Zaporozhets
|
b165b097f5
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
LICENSE
VERSION
app/controllers/omniauth_callbacks_controller.rb
app/helpers/application_helper.rb
app/helpers/merge_requests_helper.rb
app/models/group.rb
app/models/project.rb
app/models/project_team.rb
app/views/admin/groups/edit.html.haml
app/views/groups/_projects.html.haml
app/views/groups/edit.html.haml
db/schema.rb
doc/install/installation.md
doc/integration/README.md
lib/gitlab/git_access.rb
lib/gitlab/markdown.rb
spec/helpers/merge_requests_helper.rb
spec/models/merge_request_spec.rb
|
2014-06-17 10:53:44 +03:00 |
|
|
Dmitriy Zaporozhets
|
334313a7d2
|
Show shared projects on Group#show in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-18 12:29:35 +02:00 |
|
|
Dmitriy Zaporozhets
|
b50bc135d0
|
Add shared projects to User#authorized_projects
|
2013-07-11 12:02:25 +03:00 |
|
|
Dmitriy Zaporozhets
|
5c4c10e866
|
Improve shared projects title, moved Groups menu item right below Members menu item.
|
2013-07-11 09:36:38 +03:00 |
|
|
Dmitriy Zaporozhets
|
58a2a3bacb
|
Show shared projects at group dashboard
|
2013-07-10 19:21:46 +03:00 |
|