Rémy Coutable 00ac7ae84a Fix specs ... Signed-off-by: Rémy Coutable <remy@rymai.me>		2016-06-20 16:40:35 +02:00
..
config	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
controllers	Merge branch 'issue_12758' into 'master'	2016-06-17 23:28:22 +00:00
factories	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
features	Fix specs	2016-06-20 16:40:35 +02:00
finders	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
fixtures	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
helpers	Ensure group/project owners can see their members' access_level	2016-06-17 13:03:19 +02:00
initializers
javascripts	Merge branch '13525-sane-defaults-for-merge-request-js-class-constructor' into 'master'	2016-06-16 18:32:23 +00:00
lib	Merge branch 'fix-out-of-bounds-markdown-refs' into 'master'	2016-06-18 20:48:58 +00:00
mailers	Add previews for all customized Devise emails	2016-06-16 20:10:52 -04:00
models	Remove Duplicated keys add UNIQUE index to fingerprint	2016-06-20 13:29:04 +02:00
requests	Merge branch 'issue_12758' into 'master'	2016-06-17 23:28:22 +00:00
routing	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
services	Merge branch 'issue_12758' into 'master'	2016-06-17 23:28:22 +00:00
support	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export	2016-06-16 13:04:00 +02:00
tasks/gitlab	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
views
workers	Merge branch 'repo-check-require-push-events' into 'master'	2016-06-17 19:14:43 +00:00
factories_spec.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
rails_helper.rb
spec_helper.rb	Enable Knapsack only in CI environment	2016-06-08 11:43:13 +02:00
teaspoon_env.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00