Lin Jen-Shin 83418ad846 Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration ... * upstream/master: (247 commits) Switched CONTRIBUTING.md style guide recommendation for method chaining Fix new offenses Stylistic tweaks Fix OAuth/SAML user blocking behavior Revert "Enable Style/DotPosition" Revert "Prefer leading style for Style/DotPosition" Revert "Enable Style/BarePercentLiterals" Manually correct autocorrect Move up delegate calls Exclude migrations from Style/MutableConstant ActiveSupport delegation is preferred over Forwardable Update haml_lint to work with newest rubocop Add explanations to cops Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Order cops alphabetically Don’t exclude some file in lib from rubocop Fix new offenses Enable Rails/Delegate Enable Style/WordArray ...		2017-02-24 17:14:35 +08:00
..
admin	Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration	2017-02-24 17:14:35 +08:00
ci
concerns	Revert "Enable Style/DotPosition"	2017-02-23 09:33:19 -06:00
dashboard	fixes delimiter removes when todo marked as done	2017-02-22 13:28:39 +06:00
explore	Don't perform Devise trackable updates on blocked User records	2017-02-10 11:51:14 -05:00
groups	Show parent group members for nested group	2017-02-10 17:34:12 +02:00
import	Revert "Enable Style/DotPosition"	2017-02-23 09:33:19 -06:00
oauth
profiles	Enable Style/ColonMethodCall	2017-02-23 09:31:57 -06:00
projects	Merge branch 'create_branch_repo_less' into 'master'	2017-02-23 23:27:43 +00:00
sherlock	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
abuse_reports_controller.rb
application_controller.rb	Enable Performance/RedundantBlockCall	2017-02-23 09:31:57 -06:00
autocomplete_controller.rb	Don't call #uniq on a relation	2017-01-27 15:28:17 +00:00
confirmations_controller.rb	Disable automatic login feature when clicking on email confirmation links	2016-12-31 10:58:08 -05:00
dashboard_controller.rb	Present group and dashboard MR list without grouping by project	2017-01-27 20:20:18 -02:00
emojis_controller.rb
groups_controller.rb	Merge branch 'dz-create-nested-groups-via-ui' into 'master'	2017-02-09 08:32:40 +00:00
health_check_controller.rb
help_controller.rb	Don't perform Devise trackable updates on blocked User records	2017-02-10 11:51:14 -05:00
invites_controller.rb	No more and/or	2017-02-21 16:31:14 -06:00
jwt_controller.rb	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
koding_controller.rb	Don't perform Devise trackable updates on blocked User records	2017-02-10 11:51:14 -05:00
notification_settings_controller.rb
omniauth_callbacks_controller.rb	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
passwords_controller.rb
profiles_controller.rb	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
projects_controller.rb	Revert "Enable Style/DotPosition"	2017-02-23 09:33:19 -06:00
registrations_controller.rb	Merge branch 'rename_delete_services' into 'master'	2017-02-08 17:52:36 +00:00
root_controller.rb	Remove flash warning from login page	2017-01-30 20:05:04 -06:00
search_controller.rb	Don't perform Devise trackable updates on blocked User records	2017-02-10 11:51:14 -05:00
sent_notifications_controller.rb
sessions_controller.rb	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
snippets_controller.rb	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
uploads_controller.rb
users_controller.rb	Revert "Enable Style/DotPosition"	2017-02-23 09:33:19 -06:00