app/models/project.rb · bcc4e4dc7ed0740e92a61fc82c3c669f8f2d8d30 · iv / gitlab-ce

You need to sign in or sign up before continuing.

Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist · bcc4e4dc

Dmitriy Zaporozhets authored Jun 04, 2013

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

bcc4e4dc

project.rb 13.2 KB

Replace project.rb