Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
GitLab
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
4
Snippets
Groups
Projects
Show more breadcrumbs
GitLab.org
GitLab
Commits
6f314246
There was a problem fetching the pipeline summary.
Commit
6f314246
authored
8 years ago
by
Alfredo Sumaran
Browse files
Options
Downloads
Patches
Plain Diff
Fix conflicts on _summary.html.haml partial
parent
b168bf64
No related branches found
No related tags found
1 merge request
!902
CE upstream
Pipeline
#
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/views/shared/milestones/_summary.html.haml
+0
-19
0 additions, 19 deletions
app/views/shared/milestones/_summary.html.haml
with
0 additions
and
19 deletions
app/views/shared/milestones/_summary.html.haml
+
0
−
19
View file @
6f314246
...
...
@@ -4,24 +4,6 @@
.milestone-summary
%h4
Progress
<
<<<<<<
HEAD
-
remaining_days
=
milestone_remaining_days
(
milestone
)
-
if
remaining_days
%span
.milestone-stat
%span
.remaining-days
=
remaining_days
-
total_weight
=
milestone
.
issues_visible_to_user
(
current_user
).
sum
(
:weight
)
-
unless
total_weight
.
zero?
%span
.milestone-stat
Total
weight:
%strong
=
total_weight
%span
.pull-right.tab-issues-buttons
-
if
project
&&
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
New
Issue
=
link_to
'Browse Issues'
,
milestones_browse_issuables_path
(
milestone
,
type: :issues
),
class:
"btn btn-grouped"
%span
.pull-right.tab-merge-requests-buttons.hidden
=
link_to
'Browse Merge Requests'
,
milestones_browse_issuables_path
(
milestone
,
type: :merge_requests
),
class:
"btn btn-grouped"
==
=====
.milestone-stats-and-buttons
.milestone-stats
%span
.milestone-stat.with-drilldown
...
...
@@ -45,7 +27,6 @@
complete
%span
.milestone-stat
%span
.remaining-days
=
milestone_remaining_days
(
milestone
)
>
>>>>>> ce/master
.milestone-progress-buttons
%span
.tab-issues-buttons
...
...
This diff is collapsed.
Click to expand it.
Douglas Barbosa Alexandre
@dbalexandre
mentioned in merge request
!944 (merged)
·
8 years ago
mentioned in merge request
!944 (merged)
mentioned in merge request !944
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment