Douwe Maan 0c0c2ecd99 Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails ... # Conflicts: # app/controllers/admin/users_controller.rb # app/controllers/confirmations_controller.rb # app/controllers/profiles/emails_controller.rb # app/models/user.rb # app/services/emails/base_service.rb # app/services/emails/destroy_service.rb # app/views/devise/mailer/confirmation_instructions.html.haml # lib/api/users.rb # spec/services/emails/destroy_service_spec.rb		2017-10-05 12:48:22 +02:00
..
api	Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails	2017-10-05 12:48:22 +02:00
assets
backup	Ensure all refs are restored on a restore from backup	2017-09-29 15:17:05 -07:00
banzai	Merge remote-tracking branch 'upstream/master' into gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6	2017-10-03 23:03:36 +08:00
bitbucket	Whitelist or fix additional Gitlab/PublicSend cop violations	2017-08-14 12:14:11 -04:00
constraints	Enable Layout/TrailingWhitespace cop and auto-correct offenses	2017-08-15 13:44:37 -04:00
container_registry
declarative_policy	Merge branch 'rs-more-public-send-whitelists' into 'master'	2017-08-16 11:25:26 +00:00
generators/rails/post_deployment_migration
github	Fix notes type created from import	2017-09-29 11:18:58 +00:00
gitlab	Merge branch 'master' into 'master'	2017-10-04 16:59:47 +00:00
haml_lint	Restrict InlineJavaScript for haml_lint to dev and test environment	2017-08-08 10:36:21 +02:00
json_web_token
mattermost	Fix Mattermost integration	2017-08-04 12:22:10 +03:00
microsoft_teams
omni_auth/strategies	Refactor CSRF protection	2017-07-26 11:05:44 +02:00
peek/rblineprof
rouge
rspec_flaky	Use a new RspecFlakyListener to detect flaky specs	2017-08-11 14:55:10 +02:00
support	Filter sensitive query string parameters from NGINX access logs	2017-08-10 12:28:04 +01:00
system_check	Whitelist authorized_keys.lock in the gitlab:check rake task	2017-10-02 11:25:02 +01:00
tasks	Load only the currently needed JS locale file	2017-10-04 11:23:52 +00:00
additional_email_headers_interceptor.rb
after_commit_queue.rb	Update rubocop-gitlab-security to 0.1.0	2017-08-28 12:46:00 -04:00
banzai.rb
declarative_policy.rb	declarative_policy rubocop fix	2017-08-03 09:07:18 -07:00
disable_email_interceptor.rb
email_template_interceptor.rb	current_application_settings belongs on Gitlab::CurrentSettings	2017-08-31 13:38:33 +01:00
event_filter.rb
expand_variables.rb
extracts_path.rb
feature.rb
file_size_validator.rb	Whitelist or fix additional Gitlab/PublicSend cop violations	2017-08-14 12:14:11 -04:00
gitlab.rb
gt_one_coercion.rb
repository_cache.rb
static_model.rb	Re-enable SqlInjection and CommandInjection	2017-08-08 10:50:54 -04:00
system_check.rb
unfold_form.rb
uploaded_file.rb	Whitelist or fix additional Gitlab/PublicSend cop violations	2017-08-14 12:14:11 -04:00
version_check.rb