Merge branch 'master' into 'evn-add-limitations-doc'
# Conflicts: # doc/gitlab-geo/README.md
Showing
- .gitlab-ci.yml 87 additions, 70 deletions.gitlab-ci.yml
- .rubocop.yml 14 additions, 0 deletions.rubocop.yml
- .rubocop_todo.yml 0 additions, 4 deletions.rubocop_todo.yml
- CHANGELOG-EE.md 80 additions, 0 deletionsCHANGELOG-EE.md
- CHANGELOG.md 205 additions, 3251 deletionsCHANGELOG.md
- GITALY_SERVER_VERSION 1 addition, 1 deletionGITALY_SERVER_VERSION
- GITLAB_SHELL_VERSION 1 addition, 1 deletionGITLAB_SHELL_VERSION
- GITLAB_WORKHORSE_VERSION 1 addition, 1 deletionGITLAB_WORKHORSE_VERSION
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 3 additions, 3 deletionsGemfile.lock
- PROCESS.md 27 additions, 3 deletionsPROCESS.md
- VERSION 1 addition, 1 deletionVERSION
- app/assets/images/icons.json 1 addition, 1 deletionapp/assets/images/icons.json
- app/assets/images/icons.svg 1 addition, 1 deletionapp/assets/images/icons.svg
- app/assets/images/illustrations/clusters_empty.svg 1 addition, 1 deletionapp/assets/images/illustrations/clusters_empty.svg
- app/assets/images/illustrations/multi-editor_all_changes_committed_empty.svg 1 addition, 0 deletions...llustrations/multi-editor_all_changes_committed_empty.svg
- app/assets/images/illustrations/multi-editor_no_changes_empty.svg 1 addition, 0 deletions...ts/images/illustrations/multi-editor_no_changes_empty.svg
- app/assets/images/illustrations/multi-editor_no_staged_files_empty.svg 1 addition, 0 deletions...ages/illustrations/multi-editor_no_staged_files_empty.svg
- app/assets/images/illustrations/pending_job_empty.svg 1 addition, 0 deletionsapp/assets/images/illustrations/pending_job_empty.svg
- app/assets/javascripts/api.js 1 addition, 1 deletionapp/assets/javascripts/api.js
Please register or sign in to comment