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
Boxiang Sun
gitlab-ce
Commits
e7f80806
Commit
e7f80806
authored
Apr 07, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wording-of-link-text' into 'master'
Wording of link text
parents
c06255e1
db880cf3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+2
-1
doc/integration/github_app.png
doc/integration/github_app.png
+0
-0
No files found.
app/views/profiles/show.html.haml
View file @
e7f80806
...
@@ -33,8 +33,9 @@
...
@@ -33,8 +33,9 @@
=
f
.
text_field
:email
,
class:
"form-control"
,
required:
true
=
f
.
text_field
:email
,
class:
"form-control"
,
required:
true
-
if
@user
.
unconfirmed_email
.
present?
-
if
@user
.
unconfirmed_email
.
present?
%span
.help-block
%span
.help-block
We sent confirmation email
to
Please click the link in the confirmation email before continuing, it was send
to
%strong
#{
@user
.
unconfirmed_email
}
%strong
#{
@user
.
unconfirmed_email
}
-
else
-
else
%span
.help-block
We also use email for avatar detection if no avatar is uploaded.
%span
.help-block
We also use email for avatar detection if no avatar is uploaded.
.form-group
.form-group
...
...
doc/integration/github_app.png
0 → 100644
View file @
e7f80806
73.8 KB
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