-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch 'master' into admin-edit-identities
Signed-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/admin/users/show.html.haml
Showing
- CHANGELOG 8 additions, 3 deletionsCHANGELOG
- CONTRIBUTING.md 6 additions, 4 deletionsCONTRIBUTING.md
- Gemfile 12 additions, 13 deletionsGemfile
- Gemfile.lock 34 additions, 30 deletionsGemfile.lock
- app/assets/images/favicon.ico 0 additions, 0 deletionsapp/assets/images/favicon.ico
- app/assets/images/logo-white.png 0 additions, 0 deletionsapp/assets/images/logo-white.png
- app/assets/images/logo.svg 26 additions, 0 deletionsapp/assets/images/logo.svg
- app/assets/images/logo_wordmark.svg 26 additions, 0 deletionsapp/assets/images/logo_wordmark.svg
- app/assets/javascripts/application.js.coffee 1 addition, 2 deletionsapp/assets/javascripts/application.js.coffee
- app/assets/javascripts/blob/blob.js.coffee 0 additions, 73 deletionsapp/assets/javascripts/blob/blob.js.coffee
- app/assets/javascripts/dispatcher.js.coffee 1 addition, 1 deletionapp/assets/javascripts/dispatcher.js.coffee
- app/assets/javascripts/line_highlighter.js.coffee 148 additions, 0 deletionsapp/assets/javascripts/line_highlighter.js.coffee
- app/assets/javascripts/merge_request.js.coffee 7 additions, 88 deletionsapp/assets/javascripts/merge_request.js.coffee
- app/assets/javascripts/merge_request_tabs.js.coffee 153 additions, 0 deletionsapp/assets/javascripts/merge_request_tabs.js.coffee
- app/assets/stylesheets/generic/header.scss 4 additions, 0 deletionsapp/assets/stylesheets/generic/header.scss
- app/controllers/dashboard_controller.rb 2 additions, 2 deletionsapp/controllers/dashboard_controller.rb
- app/controllers/passwords_controller.rb 1 addition, 1 deletionapp/controllers/passwords_controller.rb
- app/controllers/profiles/two_factor_auths_controller.rb 2 additions, 2 deletionsapp/controllers/profiles/two_factor_auths_controller.rb
- app/controllers/projects/merge_requests_controller.rb 4 additions, 1 deletionapp/controllers/projects/merge_requests_controller.rb
- app/controllers/sessions_controller.rb 1 addition, 1 deletionapp/controllers/sessions_controller.rb
Loading
Please register or sign in to comment