Commit Graph
3 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
2015-02-04 18:19:22 -08:00
Dmitriy Zaporozhets c0acb28c4e Annotate models 2015-02-02 10:24:40 -08:00
Robert Speicher ab6f7164e0 Make the structure of spec/models match app/models 2015-01-30 15:51:10 -05:00