-
- Downloads
Revert "Fix merge conflicts - squashed commit"
This reverts commit 3e991230.
parent
3e991230
No related branches found
No related tags found
Showing
- .gitignore 39 additions, 39 deletions.gitignore
- .rubocop.yml 91 additions, 182 deletions.rubocop.yml
- CHANGELOG 12 additions, 142 deletionsCHANGELOG
- CONTRIBUTING.md 4 additions, 2 deletionsCONTRIBUTING.md
- GITLAB_SHELL_VERSION 1 addition, 1 deletionGITLAB_SHELL_VERSION
- GITLAB_WORKHORSE_VERSION 1 addition, 1 deletionGITLAB_WORKHORSE_VERSION
- Gemfile 17 additions, 22 deletionsGemfile
- Gemfile.lock 149 additions, 63 deletionsGemfile.lock
- README.md 4 additions, 2 deletionsREADME.md
- VERSION 1 addition, 1 deletionVERSION
- app/assets/images/ci/arch.jpg 0 additions, 0 deletionsapp/assets/images/ci/arch.jpg
- app/assets/images/ci/favicon.ico 0 additions, 0 deletionsapp/assets/images/ci/favicon.ico
- app/assets/images/ci/loader.gif 0 additions, 0 deletionsapp/assets/images/ci/loader.gif
- app/assets/images/ci/no_avatar.png 0 additions, 0 deletionsapp/assets/images/ci/no_avatar.png
- app/assets/images/ci/rails.png 0 additions, 0 deletionsapp/assets/images/ci/rails.png
- app/assets/images/ci/service_sample.png 0 additions, 0 deletionsapp/assets/images/ci/service_sample.png
- app/assets/images/mailers/gitlab_header_logo.png 0 additions, 0 deletionsapp/assets/images/mailers/gitlab_header_logo.png
- app/assets/images/mailers/gitlab_tanuki_2x.png 0 additions, 0 deletionsapp/assets/images/mailers/gitlab_tanuki_2x.png
- app/assets/javascripts/api.js.coffee 14 additions, 21 deletionsapp/assets/javascripts/api.js.coffee
- app/assets/javascripts/application.js.coffee 35 additions, 8 deletionsapp/assets/javascripts/application.js.coffee
Loading
Please register or sign in to comment