-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch 'mr-ui-update' into 'master'
Updated UI for new merge request Closes #2540   See merge request !3228
Showing
- app/assets/javascripts/compare.js.coffee 67 additions, 0 deletionsapp/assets/javascripts/compare.js.coffee
- app/assets/javascripts/gl_dropdown.js.coffee 32 additions, 9 deletionsapp/assets/javascripts/gl_dropdown.js.coffee
- app/assets/stylesheets/framework/dropdowns.scss 2 additions, 2 deletionsapp/assets/stylesheets/framework/dropdowns.scss
- app/assets/stylesheets/pages/commits.scss 5 additions, 0 deletionsapp/assets/stylesheets/pages/commits.scss
- app/assets/stylesheets/pages/merge_requests.scss 75 additions, 4 deletionsapp/assets/stylesheets/pages/merge_requests.scss
- app/controllers/projects/merge_requests_controller.rb 3 additions, 3 deletionsapp/controllers/projects/merge_requests_controller.rb
- app/helpers/commits_helper.rb 2 additions, 2 deletionsapp/helpers/commits_helper.rb
- app/views/projects/commits/_commit.html.haml 1 addition, 8 deletionsapp/views/projects/commits/_commit.html.haml
- app/views/projects/merge_requests/_new_compare.html.haml 63 additions, 48 deletionsapp/views/projects/merge_requests/_new_compare.html.haml
- app/views/projects/merge_requests/branch_from.html.haml 1 addition, 0 deletionsapp/views/projects/merge_requests/branch_from.html.haml
- app/views/projects/merge_requests/branch_from.js.haml 0 additions, 3 deletionsapp/views/projects/merge_requests/branch_from.js.haml
- app/views/projects/merge_requests/branch_to.html.haml 1 addition, 0 deletionsapp/views/projects/merge_requests/branch_to.html.haml
- app/views/projects/merge_requests/branch_to.js.haml 0 additions, 3 deletionsapp/views/projects/merge_requests/branch_to.js.haml
- app/views/projects/merge_requests/update_branches.html.haml 5 additions, 0 deletionsapp/views/projects/merge_requests/update_branches.html.haml
- app/views/projects/merge_requests/update_branches.js.haml 0 additions, 9 deletionsapp/views/projects/merge_requests/update_branches.js.haml
- app/views/shared/issuable/_form.html.haml 8 additions, 6 deletionsapp/views/shared/issuable/_form.html.haml
- features/project/forked_merge_requests.feature 1 addition, 0 deletionsfeatures/project/forked_merge_requests.feature
- features/project/merge_requests.feature 1 addition, 0 deletionsfeatures/project/merge_requests.feature
- features/steps/project/forked_merge_requests.rb 13 additions, 9 deletionsfeatures/steps/project/forked_merge_requests.rb
- features/steps/project/merge_requests.rb 6 additions, 2 deletionsfeatures/steps/project/merge_requests.rb
Loading
Please register or sign in to comment