Douwe Maan cc0c2d1844 Merge branch 'master' into 'zj-remove-deprecated-ci-service' ... # Conflicts: # db/schema.rb		2017-02-15 15:45:40 +00:00
..
fixtures	replace find_with_namespace with find_by_full_path	2017-02-03 07:14:04 +07:00
migrate	Merge branch 'option-to-be-notified-of-own-activity' into 'master'	2017-02-13 18:36:47 +00:00
post_migrate	Merge branch 'master' into 'zj-remove-deprecated-ci-service'	2017-02-15 15:45:40 +00:00
schema.rb	Merge branch 'master' into 'zj-remove-deprecated-ci-service'	2017-02-15 15:45:40 +00:00
seeds.rb