Douwe Maan 0a41b340b4 Merge branch 'internal_recovery_api' into 'master' ... Minor edits to two_factor_recovery_codes API error catching Minor fixes to the `two_factor_recovery_codes` internal API making the conditionals more sane. Thanks @DouweM for pointing it out. See merge request !6000		2016-09-02 14:20:07 +00:00
..
api	Merge branch 'internal_recovery_api' into 'master'	2016-09-02 14:20:07 +00:00
assets
backup	lib/backup: fix broken permissions when creating repo dir	2016-08-30 13:35:50 +02:00
banzai	Merge branch 'js-tooltips-for-mentions' into 'master'	2016-09-01 14:36:09 +00:00
ci	Add Sentry logging to API calls	2016-08-24 12:09:51 -07:00
container_registry	Make rubocop happy	2016-07-15 18:05:39 +02:00
gitlab	Merge branch 'issue_19734' into 'master'	2016-09-01 15:28:14 +00:00
json_web_token	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
omni_auth
rouge/formatters	Trim extra displayed carriage returns in diffs and files with CRLFs	2016-08-01 13:24:06 +02:00
support	Revert "Defend against 'Host' header injection"	2016-08-08 13:02:44 +02:00
tasks	Use File::exist? instead of File::exists?	2016-08-11 13:54:45 +03:00
banzai.rb	Object renderer read_multi rendered entries from Cache	2016-07-12 14:35:29 +02:00
disable_email_interceptor.rb	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
event_filter.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
extracts_path.rb	Restore get_id in ExtractsPath	2016-08-24 12:54:16 +02:00
file_size_validator.rb	Get rid of more requires, which causes warnings when code is reloaded	2016-04-19 11:48:10 +02:00
file_streamer.rb
gitlab.rb	Update Gitlab.com? to support staging	2016-06-27 15:10:36 -04:00
gt_one_coercion.rb
repository_cache.rb	Use project ID in repository cache to prevent stale data from persisting across projects	2016-07-25 05:09:28 -07:00
static_model.rb
unfold_form.rb
uploaded_file.rb	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
version_check.rb