Robert Speicher 6fb46b604e Merge branch 'internal_recovery_api' into 'master' ... Add internal API to recovery 2FA ## What does this MR do? Add an internal API to make SSH 2FA recovery possible. Related to gitlab-org/gitlab-shell!74 See merge request !5510		2016-08-24 23:45:32 +00:00
..
config	Small refactor and a few documentation fixes	2016-08-04 19:02:39 +02:00
controllers	Fix incorrect "stopped impersonation" log message	2016-08-23 01:09:16 -07:00
factories	api: expose wiki_page_events project hook field in the API	2016-08-24 10:33:51 -04:00
features	Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master'	2016-08-23 21:28:07 +00:00
finders	Merge branch 'issue_18135' into 'master'	2016-08-19 23:06:30 +00:00
fixtures	Fix JSON schema to issues in issue board lists	2016-08-19 11:47:33 -03:00
helpers	Show "Create Merge Request" widget for push events to fork projects on the source project	2016-08-24 18:54:26 +02:00
initializers	Give priority to environment variables	2016-08-03 15:48:48 +01:00
javascripts	expose 'only_allow_merge_if_build_succeeds' project setting in the API	2016-08-24 17:11:48 +09:00
lib	Merge branch 'github-importer' into 'master'	2016-08-24 20:39:29 +00:00
mailers	Merge branch 'master' into 'expiration-date-on-memberships'	2016-08-19 10:58:01 +00:00
models	Show "Create Merge Request" widget for push events to fork projects on the source project	2016-08-24 18:54:26 +02:00
requests	Merge branch 'internal_recovery_api' into 'master'	2016-08-24 23:45:32 +00:00
routing	Support integration with Koding (online IDE)	2016-08-19 12:10:58 -07:00
services	Merge branch 'mark-as-processable' into 'master'	2016-08-19 18:35:07 +00:00
support	Merge branch '4273-slash-commands' into 'master'	2016-08-18 16:41:16 -05:00
tasks/gitlab	Use File::exist? instead of File::exists?	2016-08-11 13:54:45 +03:00
uploaders	Remove VideoJS and clean the integration	2016-07-20 11:36:42 +02:00
views	Update Hamlit to 2.6.1	2016-08-18 13:26:32 -05:00
workers	Merge branch '21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-push' into 'master'	2016-08-19 18:16:55 +00:00
factories_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
rails_helper.rb
simplecov_env.rb	Bump SimpleCov merge timeout to 365 days	2016-08-22 13:44:14 +02:00
spec_helper.rb	Use travel_to instead of dependency injection, feedback:	2016-08-19 16:57:25 +08:00
teaspoon_env.rb	Add test coverage analysis for CoffeeScript (!5052)	2016-08-07 21:52:37 +02:00