Skip to content
Snippets Groups Projects
Commit 2ed7cbfb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Move projects controllers/views in Projects module

parent 95791316
No related branches found
No related tags found
No related merge requests found
Showing
with 15 additions and 15 deletions
= render "issues/head"
= render "projects/issues/head"
 
%h3.page_title
Labels
Loading
Loading
.merge-request
= render "merge_requests/show/mr_title"
= render "merge_requests/show/how_to_merge"
= render "merge_requests/show/mr_box"
= render "merge_requests/show/mr_accept"
= render "projects/merge_requests/show/mr_title"
= render "projects/merge_requests/show/how_to_merge"
= render "projects/merge_requests/show/mr_box"
= render "projects/merge_requests/show/mr_accept"
- if @project.gitlab_ci?
= render "merge_requests/show/mr_ci"
= render "merge_requests/show/commits"
= render "projects/merge_requests/show/mr_ci"
= render "projects/merge_requests/show/commits"
 
- if @commits.present?
%ul.nav.nav-tabs
Loading
Loading
@@ -19,9 +19,9 @@
Diff
 
.notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
= render "notes/notes_with_form"
= render "projects/notes/notes_with_form"
.diffs.tab-content
= render "merge_requests/show/diffs" if @diffs
= render "projects/merge_requests/show/diffs" if @diffs
.status
 
:javascript
Loading
Loading
:plain
merge_request.$(".diffs").html("#{escape_javascript(render(partial: "merge_requests/show/diffs"))}");
merge_request.$(".diffs").html("#{escape_javascript(render(partial: "projects/merge_requests/show/diffs"))}");
.merge-request
= render "merge_requests/show/mr_title"
= render "merge_requests/show/mr_box"
= render "projects/merge_requests/show/mr_title"
= render "projects/merge_requests/show/mr_box"
 
.alert.alert-error
%h5
Loading
Loading
Loading
Loading
@@ -7,19 +7,19 @@
- if @commits.count > 8
%ul.first-commits.well-list
- @commits.first(8).each do |commit|
= render "commits/commit", commit: commit
= render "projects/commits/commit", commit: commit
%li.bottom
8 of #{@commits.count} commits displayed.
%strong
%a.show-all-commits Click here to show all
%ul.all-commits.hide.well-list
- @commits.each do |commit|
= render "commits/commit", commit: commit
= render "projects/commits/commit", commit: commit
 
- else
%ul.well-list
- @commits.each do |commit|
= render "commits/commit", commit: commit
= render "projects/commits/commit", commit: commit
 
- else
%h4.nothing_here_message
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment