-
- Downloads
Merge remote-tracking branch 'upstream/master' into all-skipped-equals-success
* upstream/master: (55 commits) Restrict failed login attempts for users with 2FA Update RuboCop to 0.43.0 and update configuration Use SELECT 1, instead SELECT COUNT(*) to ask for notes existency Simplify Mentionable concern instance methods Fix issues importing services via Import/Export deployment refs in own folder, new method for creating refs Update method name Save a fetchable ref per deployement GrapeDSL for Namespace endpoint Remove SCSS rules for short hex chars. Fix bug when trying to cache closed issues from external issue trackers Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0. Remove useless code now that Member#add_user handles it Combine requestFileSuccess arguments into `opts` Append issue template to existing description Invert method's naming Fix a few things after the initial improvment to Members::DestroyService Improve Members::DestroyService Add Container Registry on/off status to admin area Enable Lint/StringConversionInInterpolation cop and autocorrect offenses ...
Showing
- .csscomb.json 1 addition, 1 deletion.csscomb.json
- .rubocop.yml 8 additions, 0 deletions.rubocop.yml
- .rubocop_todo.yml 117 additions, 53 deletions.rubocop_todo.yml
- .scss-lint.yml 1 addition, 1 deletion.scss-lint.yml
- CHANGELOG 13 additions, 0 deletionsCHANGELOG
- Gemfile 13 additions, 13 deletionsGemfile
- Gemfile.lock 12 additions, 10 deletionsGemfile.lock
- app/assets/javascripts/blob/template_selector.js 11 additions, 3 deletionsapp/assets/javascripts/blob/template_selector.js
- app/assets/javascripts/copy_to_clipboard.js 9 additions, 9 deletionsapp/assets/javascripts/copy_to_clipboard.js
- app/assets/javascripts/diff.js 7 additions, 0 deletionsapp/assets/javascripts/diff.js
- app/assets/javascripts/merge_conflict_data_provider.js.es6 11 additions, 5 deletionsapp/assets/javascripts/merge_conflict_data_provider.js.es6
- app/assets/javascripts/merge_conflict_resolver.js.es6 2 additions, 3 deletionsapp/assets/javascripts/merge_conflict_resolver.js.es6
- app/assets/javascripts/merge_request.js 3 additions, 6 deletionsapp/assets/javascripts/merge_request.js
- app/assets/javascripts/merge_request_tabs.js 29 additions, 5 deletionsapp/assets/javascripts/merge_request_tabs.js
- app/assets/javascripts/templates/issuable_template_selector.js.es6 10 additions, 8 deletions...s/javascripts/templates/issuable_template_selector.js.es6
- app/assets/stylesheets/pages/merge_requests.scss 2 additions, 1 deletionapp/assets/stylesheets/pages/merge_requests.scss
- app/controllers/concerns/authenticates_with_two_factor.rb 13 additions, 2 deletionsapp/controllers/concerns/authenticates_with_two_factor.rb
- app/controllers/concerns/membership_actions.rb 6 additions, 7 deletionsapp/controllers/concerns/membership_actions.rb
- app/controllers/concerns/spammable_actions.rb 1 addition, 1 deletionapp/controllers/concerns/spammable_actions.rb
- app/controllers/groups/group_members_controller.rb 1 addition, 4 deletionsapp/controllers/groups/group_members_controller.rb
Loading
Please register or sign in to comment