gitlab-org--gitlab-foss/features/steps
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist
Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb
2013-06-04 18:36:22 +03:00
..
admin Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
dashboard Fixing specs & spinach since Wiki model does not exists any more 2013-04-10 23:48:40 +03:00
group Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
profile Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
project Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist 2013-06-04 18:36:22 +03:00
shared Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist 2013-06-04 18:36:22 +03:00
snippets Typos fixed 2013-03-25 20:32:10 +04:00
userteams Pass project into factory for teams tests 2013-04-01 20:35:41 +03:00