Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb

2015-03-02 16:10:12 -08:00

..

files

Web Editor: save to new branch

2015-02-24 11:43:20 +02:00

action.rb

Rubocop enabled for: Use spaces inside hash literal braces

2015-02-02 20:36:54 -08:00

compare_action.rb

Git::Compare does not have limit param any more

2014-07-29 14:29:59 +03:00

logger.rb

satellites logs

2013-01-29 12:12:24 +02:00

merge_action.rb

Fix rubocop issues

2015-02-04 18:26:41 -08:00

satellite.rb

Improve error messages when file editing fails

2015-02-22 16:01:49 -07:00