-
- Downloads
Merge branch 'master' into 6-0-dev
Conflicts: app/views/dashboard/projects.html.haml app/views/layouts/_head_panel.html.haml config/routes.rb
No related branches found
No related tags found
Showing
- app/assets/javascripts/notes.js 140 additions, 7 deletionsapp/assets/javascripts/notes.js
- app/assets/stylesheets/sections/header.scss 1 addition, 0 deletionsapp/assets/stylesheets/sections/header.scss
- app/assets/stylesheets/sections/notes.scss 29 additions, 0 deletionsapp/assets/stylesheets/sections/notes.scss
- app/controllers/projects/notes_controller.rb 26 additions, 0 deletionsapp/controllers/projects/notes_controller.rb
- app/helpers/notes_helper.rb 7 additions, 0 deletionsapp/helpers/notes_helper.rb
- app/views/layouts/_head_panel.html.haml 1 addition, 1 deletionapp/views/layouts/_head_panel.html.haml
- app/views/projects/notes/_note.html.haml 36 additions, 11 deletionsapp/views/projects/notes/_note.html.haml
- app/views/snippets/_blob.html.haml 1 addition, 0 deletionsapp/views/snippets/_blob.html.haml
- app/views/snippets/show.html.haml 2 additions, 2 deletionsapp/views/snippets/show.html.haml
- config/gitlab.yml.example 1 addition, 0 deletionsconfig/gitlab.yml.example
- config/routes.rb 6 additions, 2 deletionsconfig/routes.rb
- spec/factories.rb 7 additions, 0 deletionsspec/factories.rb
- spec/features/notes_on_merge_requests_spec.rb 66 additions, 0 deletionsspec/features/notes_on_merge_requests_spec.rb
- spec/fixtures/dk.png 0 additions, 0 deletionsspec/fixtures/dk.png
- spec/routing/project_routing_spec.rb 1 addition, 1 deletionspec/routing/project_routing_spec.rb
Loading
Please register or sign in to comment