Sean McGivern 52eb523c9b Add blob_icon to conflict file JSON		2016-08-12 23:24:47 +03:00
..
config
controllers	Use same resolution format on FE and BE	2016-08-12 23:24:46 +03:00
factories
features	Fix test failures	2016-08-12 12:23:47 +02:00
finders
fixtures
helpers	Show member roles to all users on members page	2016-08-11 11:08:07 -05:00
initializers
javascripts
lib	Add blob_icon to conflict file JSON	2016-08-12 23:24:47 +03:00
mailers
models	Fix build play failure	2016-08-12 15:09:35 +02:00
requests	Merge branch 'fix-namespace-deletion' into 'master'	2016-08-12 18:04:03 +00:00
routing
services	Merge branch 'fix-namespace-deletion' into 'master'	2016-08-12 18:04:03 +00:00
support	Add backend for merge conflicts reading	2016-08-12 23:24:43 +03:00
tasks/gitlab
uploaders
views
workers	Fix bug where destroying a namespace would not always destroy projects	2016-08-11 15:36:35 -07:00
factories_spec.rb
rails_helper.rb
simplecov_env.rb
spec_helper.rb
teaspoon_env.rb