Files
gitlabhq/doc/update
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
2014-10-02 13:24:59 +03:00
..
2014-08-11 22:01:37 -07:00
2014-08-30 17:04:45 -07:00
2014-09-01 16:39:56 -07:00
2014-09-01 16:39:56 -07:00
2014-09-01 16:39:56 -07:00
2013-12-02 14:40:08 +01:00
2014-01-28 18:25:46 +01:00
2014-04-02 10:38:15 +02:00
2014-09-01 16:39:56 -07:00
2014-06-11 10:33:06 +02:00
2014-09-07 15:31:13 -07:00
2014-06-20 08:21:10 +02:00
2014-09-01 16:39:56 -07:00