Merge branch '9-3-actually-stable-ee-rc2' into '9-3-actually-stable-ee'
Merge RC2 into 9.3 (actually-stable) See merge request !2122
Showing
- .codeclimate.yml 38 additions, 0 deletions.codeclimate.yml
- .eslintrc 1 addition, 0 deletions.eslintrc
- .gitignore 2 additions, 0 deletions.gitignore
- .gitlab-ci.yml 125 additions, 147 deletions.gitlab-ci.yml
- .gitlab/issue_templates/Bug.md 8 additions, 0 deletions.gitlab/issue_templates/Bug.md
- .rubocop.yml 29 additions, 1 deletion.rubocop.yml
- .rubocop_todo.yml 0 additions, 23 deletions.rubocop_todo.yml
- .scss-lint.yml 34 additions, 34 deletions.scss-lint.yml
- CHANGELOG-EE.md 46 additions, 0 deletionsCHANGELOG-EE.md
- CHANGELOG.md 45 additions, 0 deletionsCHANGELOG.md
- GITLAB_SHELL_VERSION 1 addition, 1 deletionGITLAB_SHELL_VERSION
- Gemfile 9 additions, 4 deletionsGemfile
- Gemfile.lock 27 additions, 16 deletionsGemfile.lock
- VERSION 1 addition, 1 deletionVERSION
- app/assets/images/mailers/approval/icon-merge-request-gray.gif 0 additions, 0 deletions...ssets/images/mailers/approval/icon-merge-request-gray.gif
- app/assets/javascripts/admin_email_select.js 1 addition, 1 deletionapp/assets/javascripts/admin_email_select.js
- app/assets/javascripts/api.js 136 additions, 111 deletionsapp/assets/javascripts/api.js
- app/assets/javascripts/approvers_select.js 2 additions, 2 deletionsapp/assets/javascripts/approvers_select.js
- app/assets/javascripts/audit_logs.js 50 additions, 0 deletionsapp/assets/javascripts/audit_logs.js
- app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js 16 additions, 16 deletionsapp/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
Please register or sign in to comment