diff options
| author | James Lopez <james@jameslopez.es> | 2016-01-29 14:27:10 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-01-29 14:27:10 +0100 |
| commit | 7ca6779654ed2da5ba31ab9256406feb1b7fb8ee (patch) | |
| tree | 8c3d1e2eb642b667c9e46babdc786a4d4dc3c789 /app/views/projects/milestones/show.html.haml | |
| parent | 4d2da5fd2585fead823c4450e54613dadf882c0d (diff) | |
| parent | f5860ce6466bf8934bc01254351bffd005dfeafe (diff) | |
| download | gitlab-ce-7ca6779654ed2da5ba31ab9256406feb1b7fb8ee.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue
Diffstat (limited to 'app/views/projects/milestones/show.html.haml')
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 1142c584592..528a4f9552f 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -32,7 +32,7 @@ = icon('pencil-square-o') Edit -.detail-page-description.gray-content-block.second-block +.detail-page-description.content-block %h2.title = markdown escape_once(@milestone.title), pipeline: :single_line %div @@ -73,8 +73,8 @@ .tab-content .tab-pane.active#tab-issues - .gray-content-block.middle-block - .pull-right + .content-block.oneline-block + .controls - if can?(current_user, :create_issue, @project) = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn btn-grouped", title: "New Issue" do %i.fa.fa-plus @@ -94,8 +94,8 @@ = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed, id: 'closed') .tab-pane#tab-merge-requests - .gray-content-block.middle-block - .pull-right + .content-block.oneline-block + .controls - if can?(current_user, :read_merge_request, @project) = link_to 'Browse Merge Requests', namespace_project_merge_requests_path(@milestone.project.namespace, @milestone.project, milestone_title: @milestone.title), class: "btn btn-grouped" @@ -117,9 +117,8 @@ = render 'merge_request', merge_request: merge_request .tab-pane#tab-participants - .gray-content-block.middle-block - .oneline - All participants to this milestone + .content-block.oneline-block + All participants to this milestone %ul.bordered-list - @users.each do |user| |