Commit Graph
12 Commits
Author SHA1 Message Date
Vinnie Okada 067a5b9d8b Update path helpers and routes for Rails 4.1.9
Update project path helpers and routes to reflect the new nested
resources introduced in the Rails 4.1.9 upgrade.
2015-02-27 18:21:15 -07:00
Dmitriy Zaporozhets 96a3f0e0a8 Fix rubocop issues 2015-02-04 18:26:41 -08:00
Dmitriy Zaporozhets 15a0e1d6b9 Fix tests for share project with group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-30 12:48:29 +02:00
Dmitriy Zaporozhets 1abfc0730e Fix performance issue for "Share project with other groups" page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-30 11:49:53 +02:00
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
GitLab 19a8b6ce71 Remove copyright licenses missed in 0fdab6a747. 2014-06-02 09:11:24 +02:00
Dmitriy Zaporozhets 348653bc83 ProjectGroupLink access level
Now you can specify max access level for shared projects
2013-08-20 13:59:43 +03:00
Dmitriy Zaporozhets 541e70d8f8 Replace license to MIT in EE files 2013-08-12 13:35:52 +03:00
Dmitriy Zaporozhets a7026369cf Show real shared projects at group page 2013-07-11 11:51:02 +03:00
Dmitriy Zaporozhets 909e479e69 Implement Projects::GroupLinkController logic 2013-07-11 11:44:58 +03:00
Dmitriy Zaporozhets c3617833dc Add LICENSE to GroupLinks controller 2013-07-10 21:46:29 +03:00
Dmitriy Zaporozhets 0b012d9662 GroupLinks: Empty Scaffold, routes + sample page 2013-07-10 16:14:00 +03:00