-
- Downloads
Merge branch 'revert-mr-state-names'
Signed-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/merge_requests.rb
Showing
- CHANGELOG 3 additions, 2 deletionsCHANGELOG
- app/finders/issuable_finder.rb 7 additions, 9 deletionsapp/finders/issuable_finder.rb
- app/helpers/application_helper.rb 2 additions, 3 deletionsapp/helpers/application_helper.rb
- app/models/merge_request.rb 13 additions, 5 deletionsapp/models/merge_request.rb
- app/models/milestone.rb 1 addition, 1 deletionapp/models/milestone.rb
- app/views/projects/merge_requests/_merge_request.html.haml 2 additions, 2 deletionsapp/views/projects/merge_requests/_merge_request.html.haml
- app/views/projects/merge_requests/show/_mr_title.html.haml 1 addition, 6 deletionsapp/views/projects/merge_requests/show/_mr_title.html.haml
- app/views/projects/merge_requests/widget/_closed.html.haml 1 addition, 1 deletionapp/views/projects/merge_requests/widget/_closed.html.haml
- app/views/projects/merge_requests/widget/_merged.html.haml 1 addition, 1 deletionapp/views/projects/merge_requests/widget/_merged.html.haml
- app/views/projects/milestones/show.html.haml 2 additions, 2 deletionsapp/views/projects/milestones/show.html.haml
- app/views/search/results/_merge_request.html.haml 2 additions, 2 deletionsapp/views/search/results/_merge_request.html.haml
- app/views/shared/_issuable_filter.html.haml 3 additions, 3 deletionsapp/views/shared/_issuable_filter.html.haml
- features/project/merge_requests.feature 1 addition, 1 deletionfeatures/project/merge_requests.feature
- features/steps/project/merge_requests.rb 4 additions, 4 deletionsfeatures/steps/project/merge_requests.rb
- spec/requests/api/merge_requests_spec.rb 2 additions, 3 deletionsspec/requests/api/merge_requests_spec.rb
Loading
Please register or sign in to comment