Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f5736fac
Commit
f5736fac
authored
Mar 29, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict in app/controllers/projects/milestones_controller.rb
parent
d26074e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
app/controllers/projects/milestones_controller.rb
app/controllers/projects/milestones_controller.rb
+1
-3
No files found.
app/controllers/projects/milestones_controller.rb
View file @
f5736fac
...
...
@@ -43,14 +43,12 @@ class Projects::MilestonesController < Projects::ApplicationController
def
show
@project_namespace
=
@project
.
namespace
.
becomes
(
Namespace
)
<<<<<<<
HEAD
if
@project
.
feature_available?
(
:burndown_charts
,
current_user
)
&&
@project
.
feature_available?
(
:issue_weights
,
current_user
)
@burndown
=
Burndown
.
new
(
@milestone
)
=======
respond_to
do
|
format
|
format
.
html
>>>>>>>
upstream
/
master
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment