Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 ...

Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb

2014-08-15 10:25:23 +02:00

..

gitlab

Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166

2014-08-15 10:25:23 +02:00

auth_spec.rb

More fixes to test because of long password

2013-11-25 21:36:17 +02:00

extracts_path_spec.rb

fix most of warnings

2013-12-15 00:05:10 +04:00

oauth_spec.rb

Add nickname to oauth_spec

2014-04-07 16:03:05 +03:00

votes_spec.rb

Specs refactoring to reduce test time. Disabled observers by default for specs

2013-04-10 23:28:42 +03:00