Files
gitlabhq/doc/workflow
Dmitriy Zaporozhets dd32818441 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/assets/javascripts/project_new.js.coffee
	app/helpers/appearances_helper.rb
	app/helpers/application_helper.rb
	app/helpers/groups_helper.rb
	app/helpers/oauth_helper.rb
	app/models/user.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/layouts/nav/_group.html.haml
	app/views/layouts/nav/_project_settings.html.haml
	app/views/profiles/accounts/show.html.haml
	doc/integration/README.md
	features/steps/project/merge_requests.rb
	features/support/env.rb
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/oauth_helper_spec.rb
	spec/lib/gitlab/ldap/access_spec.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/project_team_spec.rb
	spec/routing/admin_routing_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/test_hook_service_spec.rb
2015-07-02 17:07:02 +02:00
..
2014-08-20 14:25:55 +02:00
2015-02-24 20:36:11 +02:00
2014-09-28 13:59:33 +02:00
2014-10-01 15:30:29 +02:00
2015-06-22 10:02:59 -07:00
2014-08-20 16:24:17 +02:00
2015-03-12 16:58:11 -07:00
2015-03-05 15:13:26 +01:00
2015-05-22 23:08:50 +00:00
2015-05-22 15:57:29 -07:00
2015-02-24 20:36:11 +02:00