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
3400cf9e
Commit
3400cf9e
authored
May 14, 2020
by
Rajendra Kadam
Committed by
Peter Leitzen
May 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move prepend to last line in helpers
parent
10d20285
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
app/helpers/form_helper.rb
app/helpers/form_helper.rb
+2
-2
app/helpers/sorting_helper.rb
app/helpers/sorting_helper.rb
+2
-2
changelogs/unreleased/app-helpers.yml
changelogs/unreleased/app-helpers.yml
+5
-0
No files found.
app/helpers/form_helper.rb
View file @
3400cf9e
# frozen_string_literal: true
# frozen_string_literal: true
module
FormHelper
module
FormHelper
prepend_if_ee
(
'::EE::FormHelper'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
def
form_errors
(
model
,
type:
'form'
,
truncate:
[])
def
form_errors
(
model
,
type:
'form'
,
truncate:
[])
return
unless
model
.
errors
.
any?
return
unless
model
.
errors
.
any?
...
@@ -79,3 +77,5 @@ module FormHelper
...
@@ -79,3 +77,5 @@ module FormHelper
new_options
new_options
end
end
end
end
FormHelper
.
prepend_if_ee
(
'::EE::FormHelper'
)
app/helpers/sorting_helper.rb
View file @
3400cf9e
# frozen_string_literal: true
# frozen_string_literal: true
module
SortingHelper
module
SortingHelper
prepend_if_ee
(
'::EE::SortingHelper'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
def
sort_options_hash
def
sort_options_hash
{
{
sort_value_created_date
=>
sort_title_created_date
,
sort_value_created_date
=>
sort_title_created_date
,
...
@@ -584,3 +582,5 @@ module SortingHelper
...
@@ -584,3 +582,5 @@ module SortingHelper
'expired_asc'
'expired_asc'
end
end
end
end
SortingHelper
.
prepend_if_ee
(
'::EE::SortingHelper'
)
changelogs/unreleased/app-helpers.yml
0 → 100644
View file @
3400cf9e
---
title
:
Move prepend to last line in helper files
merge_request
:
29327
author
:
Rajendra Kadam
type
:
fixed
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