Stan Hu 4477dc249e Merge branch 'fix-settings-spec' into 'master' ... Fix settings_spec so that it can that run by itself Running `spec/settings_spec.rb` would fail because it would attempt to load `1_settings.rb`, which would reference `Rails`. This constant was not loaded without `spec_helper.rb`. See merge request !4893		2016-06-24 06:01:49 +00:00
..
config	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
controllers	Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'	2016-06-22 01:15:29 +00:00
factories	Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project	2016-06-20 14:04:14 +00:00
features	Merge branch '19008_ci_dropdown_label_fix' into 'master'	2016-06-23 21:46:50 +00:00
finders	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
fixtures	Show proper image ID on registry page	2016-06-21 13:08:10 +02:00
helpers	Remove Haml helpers from the visibility level spec.	2016-06-22 16:10:26 -06:00
initializers	Fix settings_spec so that it can that run by itself	2016-06-23 22:26:33 -07:00
javascripts	Added text_utility to JS tests	2016-06-20 08:54:57 +01:00
lib	Merge branch 'fix/import-export-gitlab-errors' into 'master'	2016-06-23 14:13:17 +00:00
mailers	Fallback to group's owners/masters when a project has none	2016-06-20 12:10:37 +02:00
models	Fix pagination on sorts with lots of ties	2016-06-23 15:26:50 +01:00
requests	Fix builds API response not including commit data	2016-06-21 14:26:57 +02:00
routing	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
services	Raise a new Gitlab::Access::AccessDeniedError when permission is not enough to destroy a member	2016-06-18 06:06:34 +02: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	Unify check branch name exist	2016-06-20 21:44:21 +02: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