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
Léo-Paul Géneau
gitlab-ce
Commits
a46c91f4
Commit
a46c91f4
authored
Mar 08, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix inappropriate regex
parent
56f50cbb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/finders/pipelines_finder.rb
app/finders/pipelines_finder.rb
+1
-1
No files found.
app/finders/pipelines_finder.rb
View file @
a46c91f4
...
@@ -101,7 +101,7 @@ class PipelinesFinder
...
@@ -101,7 +101,7 @@ class PipelinesFinder
def
order_and_sort
(
items
)
def
order_and_sort
(
items
)
if
params
[
:order_by
].
present?
&&
params
[
:sort
].
present?
&&
if
params
[
:order_by
].
present?
&&
params
[
:sort
].
present?
&&
items
.
column_names
.
include?
(
params
[
:order_by
])
&&
items
.
column_names
.
include?
(
params
[
:order_by
])
&&
params
[
:sort
]
=~
/\A(ASC|DESC)\
Z
/i
params
[
:sort
]
=~
/\A(ASC|DESC)\
z
/i
items
.
reorder
(
params
[
:order_by
]
=>
params
[
:sort
])
items
.
reorder
(
params
[
:order_by
]
=>
params
[
:sort
])
else
else
items
.
reorder
(
id: :desc
)
items
.
reorder
(
id: :desc
)
...
...
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