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
1aeec043
Commit
1aeec043
authored
Aug 27, 2018
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename Gitlab::Template::LicenseTemplate to CustomLicenseTemplate
parent
bffcac9c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
ee/app/finders/ee/license_template_finder.rb
ee/app/finders/ee/license_template_finder.rb
+1
-1
ee/lib/gitlab/template/custom_license_template.rb
ee/lib/gitlab/template/custom_license_template.rb
+1
-1
ee/spec/finders/license_template_finder_spec.rb
ee/spec/finders/license_template_finder_spec.rb
+1
-1
ee/spec/helpers/ee/blob_helper_spec.rb
ee/spec/helpers/ee/blob_helper_spec.rb
+1
-1
No files found.
ee/app/finders/ee/license_template_finder.rb
View file @
1aeec043
...
@@ -29,7 +29,7 @@ module EE
...
@@ -29,7 +29,7 @@ module EE
end
end
def
custom_licenses
def
custom_licenses
::
Gitlab
::
Template
::
LicenseTemplate
.
all
(
template_project
)
::
Gitlab
::
Template
::
Custom
LicenseTemplate
.
all
(
template_project
)
end
end
def
template_project
def
template_project
...
...
ee/lib/gitlab/template/license_template.rb
→
ee/lib/gitlab/template/
custom_
license_template.rb
View file @
1aeec043
module
Gitlab
module
Gitlab
module
Template
module
Template
class
LicenseTemplate
<
BaseTemplate
class
Custom
LicenseTemplate
<
BaseTemplate
class
<<
self
class
<<
self
def
extension
def
extension
'.txt'
'.txt'
...
...
ee/spec/finders/license_template_finder_spec.rb
View file @
1aeec043
...
@@ -11,7 +11,7 @@ describe LicenseTemplateFinder do
...
@@ -11,7 +11,7 @@ describe LicenseTemplateFinder do
before
do
before
do
stub_ee_application_setting
(
file_template_project:
project
)
stub_ee_application_setting
(
file_template_project:
project
)
allow
(
Gitlab
::
Template
::
LicenseTemplate
)
allow
(
Gitlab
::
Template
::
Custom
LicenseTemplate
)
.
to
receive
(
:all
)
.
to
receive
(
:all
)
.
with
(
project
)
.
with
(
project
)
.
and_return
([
OpenStruct
.
new
(
name:
"custom template"
)])
.
and_return
([
OpenStruct
.
new
(
name:
"custom template"
)])
...
...
ee/spec/helpers/ee/blob_helper_spec.rb
View file @
1aeec043
...
@@ -17,7 +17,7 @@ describe BlobHelper do
...
@@ -17,7 +17,7 @@ describe BlobHelper do
stub_licensed_features
(
custom_file_templates:
true
)
stub_licensed_features
(
custom_file_templates:
true
)
stub_ee_application_setting
(
file_template_project:
project
)
stub_ee_application_setting
(
file_template_project:
project
)
expect
(
Gitlab
::
Template
::
LicenseTemplate
)
expect
(
Gitlab
::
Template
::
Custom
LicenseTemplate
)
.
to
receive
(
:all
)
.
to
receive
(
:all
)
.
with
(
project
)
.
with
(
project
)
.
and_return
([
OpenStruct
.
new
(
name:
"name"
)])
.
and_return
([
OpenStruct
.
new
(
name:
"name"
)])
...
...
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