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
0
Merge Requests
0
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
iv
gitlab-ce
Commits
a45cb688
Commit
a45cb688
authored
Mar 17, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed failing tests
parent
0eecc214
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
app/controllers/projects/milestones_controller.rb
app/controllers/projects/milestones_controller.rb
+1
-1
app/helpers/labels_helper.rb
app/helpers/labels_helper.rb
+5
-6
No files found.
app/controllers/projects/milestones_controller.rb
View file @
a45cb688
...
@@ -25,7 +25,7 @@ class Projects::MilestonesController < Projects::ApplicationController
...
@@ -25,7 +25,7 @@ class Projects::MilestonesController < Projects::ApplicationController
@milestones
=
@milestones
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
@milestones
=
@milestones
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
end
end
format
.
json
do
format
.
json
do
render
json:
@milestones
_all
render
json:
@milestones
end
end
end
end
end
end
...
...
app/helpers/labels_helper.rb
View file @
a45cb688
...
@@ -110,12 +110,11 @@ module LabelsHelper
...
@@ -110,12 +110,11 @@ module LabelsHelper
end
end
def
projects_labels_options
def
projects_labels_options
labels
=
if
@project
if
@project
@project
.
labels
@project
.
labels
else
else
Label
.
where
(
project_id:
@projects
)
Label
.
where
(
project_id:
@projects
)
end
end
end
end
def
labels_filter_path
def
labels_filter_path
...
...
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