Dmitriy Zaporozhets 6c4d48b8b9 Merge branch 'rs-remove-link-to-override' ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/helpers/application_helper_spec.rb		2015-06-22 12:26:41 +02:00
..
controllers	Merge branch 'rs-dev-issue-2355' into 'master'	2015-06-22 09:48:49 +00:00
factories
features	Add 2FA status to Admin::Users#show	2015-06-19 15:04:47 -04:00
finders
fixtures
helpers	Merge branch 'rs-remove-link-to-override'	2015-06-22 12:26:41 +02:00
javascripts	Merge branch 'rs-dev-issue-2355' into 'master'	2015-06-22 09:48:49 +00:00
lib	Add init test for ProjectSearchResults	2015-06-18 10:35:48 -07:00
mailers
models	Merge branch 'rs-dev-issue-2355' into 'master'	2015-06-22 09:48:49 +00:00
requests/api	Change foo.should syntax to expect(foo).to in specs	2015-06-13 18:37:30 -04:00
routing	Add RootController	2015-06-13 17:59:11 -04:00
services	Merge branch 'fix-ext-issue-webbased-hooks' into 'master'	2015-06-16 11:36:31 +00:00
support	Fix Error 500 when one user attempts to access a personal, internal snippet	2015-06-19 21:23:46 -07:00
tasks/gitlab
workers
factories.rb	Add convenience methods to User for getting and setting 2FA status	2015-06-19 14:59:42 -04:00
factories_spec.rb
spec_helper.rb	Fix shoulda-matchers require	2015-06-10 01:38:36 -04:00
teaspoon_env.rb	teaspoon install	2015-05-28 18:22:32 -04:00