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
a5f4e2fb
Commit
a5f4e2fb
authored
May 15, 2019
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve CE/EE diffs in signup_box
Part of single codebase changes.
parent
7dc29e9c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
1 deletion
+1
-1
app/views/devise/shared/_signup_box.html.haml
app/views/devise/shared/_signup_box.html.haml
+1
-1
ee/app/views/devise/shared/_email_opted_in.html.haml
ee/app/views/devise/shared/_email_opted_in.html.haml
+0
-0
No files found.
app/views/devise/shared/_signup_box.html.haml
View file @
a5f4e2fb
...
...
@@ -29,7 +29,7 @@
-
terms_link
=
link_to
s_
(
"I accept the|Terms of Service and Privacy Policy"
),
terms_path
,
target:
"_blank"
-
accept_terms_label
=
_
(
"I accept the %{terms_link}"
)
%
{
terms_link:
terms_link
}
=
accept_terms_label
.
html_safe
=
render
'devise/shared/ee
/email_opted_in'
,
f:
f
=
render
_if_exists
'devise/shared
/email_opted_in'
,
f:
f
%div
-
if
Gitlab
::
Recaptcha
.
enabled?
=
recaptcha_tags
...
...
ee/app/views/devise/shared/
ee/
_email_opted_in.html.haml
→
ee/app/views/devise/shared/_email_opted_in.html.haml
View file @
a5f4e2fb
File moved
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