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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
7008ace6
Commit
7008ace6
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4945 from jameswritescode/iid_for_emails
have email views use iid
parents
30b8218f
850b4af0
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
29 additions
and
29 deletions
+29
-29
app/views/notify/closed_issue_email.html.haml
app/views/notify/closed_issue_email.html.haml
+1
-1
app/views/notify/closed_issue_email.text.haml
app/views/notify/closed_issue_email.text.haml
+1
-1
app/views/notify/closed_merge_request_email.html.haml
app/views/notify/closed_merge_request_email.html.haml
+1
-1
app/views/notify/closed_merge_request_email.text.haml
app/views/notify/closed_merge_request_email.text.haml
+1
-1
app/views/notify/issue_status_changed_email.html.haml
app/views/notify/issue_status_changed_email.html.haml
+1
-1
app/views/notify/issue_status_changed_email.text.erb
app/views/notify/issue_status_changed_email.text.erb
+1
-1
app/views/notify/merged_merge_request_email.html.haml
app/views/notify/merged_merge_request_email.html.haml
+1
-1
app/views/notify/merged_merge_request_email.text.haml
app/views/notify/merged_merge_request_email.text.haml
+1
-1
app/views/notify/new_issue_email.html.haml
app/views/notify/new_issue_email.html.haml
+1
-1
app/views/notify/new_issue_email.text.erb
app/views/notify/new_issue_email.text.erb
+2
-2
app/views/notify/new_merge_request_email.html.haml
app/views/notify/new_merge_request_email.html.haml
+1
-1
app/views/notify/new_merge_request_email.text.erb
app/views/notify/new_merge_request_email.text.erb
+1
-1
app/views/notify/new_user_email.text.erb
app/views/notify/new_user_email.text.erb
+1
-1
app/views/notify/note_issue_email.html.haml
app/views/notify/note_issue_email.html.haml
+1
-1
app/views/notify/note_issue_email.text.erb
app/views/notify/note_issue_email.text.erb
+1
-1
app/views/notify/note_merge_request_email.html.haml
app/views/notify/note_merge_request_email.html.haml
+1
-1
app/views/notify/note_merge_request_email.text.erb
app/views/notify/note_merge_request_email.text.erb
+3
-3
app/views/notify/note_wall_email.text.erb
app/views/notify/note_wall_email.text.erb
+1
-1
app/views/notify/project_was_moved_email.text.erb
app/views/notify/project_was_moved_email.text.erb
+2
-2
app/views/notify/reassigned_issue_email.html.haml
app/views/notify/reassigned_issue_email.html.haml
+1
-1
app/views/notify/reassigned_issue_email.text.erb
app/views/notify/reassigned_issue_email.text.erb
+2
-2
app/views/notify/reassigned_merge_request_email.html.haml
app/views/notify/reassigned_merge_request_email.html.haml
+1
-1
app/views/notify/reassigned_merge_request_email.text.erb
app/views/notify/reassigned_merge_request_email.text.erb
+2
-2
No files found.
app/views/notify/closed_issue_email.html.haml
View file @
7008ace6
%p
%p
=
"Issue was closed by
#{
@updated_by
.
name
}
"
=
"Issue was closed by
#{
@updated_by
.
name
}
"
%p
%p
=
"Issue #
#{
@issue
.
id
}
"
=
"Issue #
#{
@issue
.
i
i
d
}
"
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
45
),
project_issue_url
(
@issue
.
project
,
@issue
),
title:
@issue
.
title
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
45
),
project_issue_url
(
@issue
.
project
,
@issue
),
title:
@issue
.
title
This diff is collapsed.
Click to expand it.
app/views/notify/closed_issue_email.text.haml
View file @
7008ace6
=
"Issue was closed by
#{
@updated_by
.
name
}
"
=
"Issue was closed by
#{
@updated_by
.
name
}
"
Issue ##{@issue.id}:
#{
project_issue_url
(
@issue
.
project
,
@issue
)
}
Issue ##{@issue.i
i
d}:
#{
project_issue_url
(
@issue
.
project
,
@issue
)
}
This diff is collapsed.
Click to expand it.
app/views/notify/closed_merge_request_email.html.haml
View file @
7008ace6
%p
%p
=
"Merge Request
#{
@merge_request
.
id
}
was closed by
#{
@updated_by
.
name
}
"
=
"Merge Request
#{
@merge_request
.
i
i
d
}
was closed by
#{
@updated_by
.
name
}
"
%p
%p
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
40
),
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
40
),
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
%p
%p
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/closed_merge_request_email.text.haml
View file @
7008ace6
=
"Merge Request
#{
@merge_request
.
id
}
was closed by
#{
@updated_by
.
name
}
"
=
"Merge Request
#{
@merge_request
.
i
i
d
}
was closed by
#{
@updated_by
.
name
}
"
Merge Request url:
#{
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
}
Merge Request url:
#{
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
}
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/issue_status_changed_email.html.haml
View file @
7008ace6
%p
%p
=
"Issue was
#{
@issue_status
}
by
#{
@updated_by
.
name
}
"
=
"Issue was
#{
@issue_status
}
by
#{
@updated_by
.
name
}
"
%p
%p
=
"Issue #
#{
@issue
.
id
}
"
=
"Issue #
#{
@issue
.
i
i
d
}
"
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
45
),
project_issue_url
(
@issue
.
project
,
@issue
),
title:
@issue
.
title
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
45
),
project_issue_url
(
@issue
.
project
,
@issue
),
title:
@issue
.
title
This diff is collapsed.
Click to expand it.
app/views/notify/issue_status_changed_email.text.erb
View file @
7008ace6
Issue was
<%=
@issue_status
%>
by
<%=
@updated_by
.
name
%>
Issue was
<%=
@issue_status
%>
by
<%=
@updated_by
.
name
%>
Issue
<%=
@issue
.
id
%>
:
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
))
%>
Issue
<%=
@issue
.
i
i
d
%>
:
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
))
%>
This diff is collapsed.
Click to expand it.
app/views/notify/merged_merge_request_email.html.haml
View file @
7008ace6
%p
%p
=
"Merge Request
#{
@merge_request
.
id
}
was merged"
=
"Merge Request
#{
@merge_request
.
i
i
d
}
was merged"
%p
%p
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
40
),
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
40
),
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
%p
%p
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/merged_merge_request_email.text.haml
View file @
7008ace6
=
"Merge Request
#{
@merge_request
.
id
}
was merged"
=
"Merge Request
#{
@merge_request
.
i
i
d
}
was merged"
Merge Request Url:
#{
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
}
Merge Request Url:
#{
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
}
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/new_issue_email.html.haml
View file @
7008ace6
%p
%p
New Issue was created.
New Issue was created.
%p
%p
=
"Issue #
#{
@issue
.
id
}
"
=
"Issue #
#{
@issue
.
i
i
d
}
"
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
45
),
project_issue_url
(
@issue
.
project
,
@issue
),
title:
@issue
.
title
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
45
),
project_issue_url
(
@issue
.
project
,
@issue
),
title:
@issue
.
title
%p
%p
Author:
#{
@issue
.
author_name
}
Author:
#{
@issue
.
author_name
}
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/new_issue_email.text.erb
View file @
7008ace6
New Issue was created.
New Issue was created.
Issue
<%=
@issue
.
id
%>
:
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
))
%>
Issue
<%=
@issue
.
i
i
d
%>
:
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
))
%>
Author:
<%=
@issue
.
author_name
%>
Author:
<%=
@issue
.
author_name
%>
Asignee:
<%=
@issue
.
assignee_name
%>
Asignee:
<%=
@issue
.
assignee_name
%>
This diff is collapsed.
Click to expand it.
app/views/notify/new_merge_request_email.html.haml
View file @
7008ace6
%p
%p
=
"New Merge Request !
#{
@merge_request
.
id
}
"
=
"New Merge Request !
#{
@merge_request
.
i
i
d
}
"
%p
%p
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
40
),
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
40
),
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
%p
%p
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/new_merge_request_email.text.erb
View file @
7008ace6
New Merge Request
<%=
@merge_request
.
id
%>
New Merge Request
<%=
@merge_request
.
i
i
d
%>
<%=
url_for
(
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
))
%>
<%=
url_for
(
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
))
%>
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/new_user_email.text.erb
View file @
7008ace6
...
@@ -5,7 +5,7 @@ The Administrator created an account for you. Now you are a member of the compan
...
@@ -5,7 +5,7 @@ The Administrator created an account for you. Now you are a member of the compan
login..................
<%=
@user
.
email
%>
login..................
<%=
@user
.
email
%>
<%
if
@user
.
created_by_id
%>
<%
if
@user
.
created_by_id
%>
password...............
<%=
@password
%>
password...............
<%=
@password
%>
You will be forced to change this password immediately after login.
You will be forced to change this password immediately after login.
<%
end
%>
<%
end
%>
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/note_issue_email.html.haml
View file @
7008ace6
%p
%p
=
"New comment for Issue #
#{
@issue
.
id
}
"
=
"New comment for Issue #
#{
@issue
.
i
i
d
}
"
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
35
),
project_issue_url
(
@issue
.
project
,
@issue
,
anchor:
"note_
#{
@note
.
id
}
"
)
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
35
),
project_issue_url
(
@issue
.
project
,
@issue
,
anchor:
"note_
#{
@note
.
id
}
"
)
=
render
'note_message'
=
render
'note_message'
This diff is collapsed.
Click to expand it.
app/views/notify/note_issue_email.text.erb
View file @
7008ace6
New comment for Issue
<%=
@issue
.
id
%>
New comment for Issue
<%=
@issue
.
i
i
d
%>
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
,
anchor:
"note_
#{
@note
.
id
}
"
))
%>
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
,
anchor:
"note_
#{
@note
.
id
}
"
))
%>
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/note_merge_request_email.html.haml
View file @
7008ace6
...
@@ -3,6 +3,6 @@
...
@@ -3,6 +3,6 @@
=
link_to
"New comment on diff"
,
diffs_project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
,
anchor:
"note_
#{
@note
.
id
}
"
)
=
link_to
"New comment on diff"
,
diffs_project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
,
anchor:
"note_
#{
@note
.
id
}
"
)
-
else
-
else
=
link_to
"New comment"
,
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
,
anchor:
"note_
#{
@note
.
id
}
"
)
=
link_to
"New comment"
,
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
,
anchor:
"note_
#{
@note
.
id
}
"
)
for Merge Request ##{@merge_request.id}
for Merge Request ##{@merge_request.i
i
d}
%cite
"
#{
truncate
(
@merge_request
.
title
,
length:
20
)
}
"
%cite
"
#{
truncate
(
@merge_request
.
title
,
length:
20
)
}
"
=
render
'note_message'
=
render
'note_message'
This diff is collapsed.
Click to expand it.
app/views/notify/note_merge_request_email.text.erb
View file @
7008ace6
New comment for Merge Request
<%=
@merge_request
.
id
%>
New comment for Merge Request
<%=
@merge_request
.
i
i
d
%>
<%=
url_for
(
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
,
anchor:
"note_
#{
@note
.
id
}
"
))
%>
<%=
url_for
(
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
,
anchor:
"note_
#{
@note
.
id
}
"
))
%>
<%=
@note
.
author_name
%>
<%=
@note
.
author_name
%>
<%=
@note
.
note
%>
<%=
@note
.
note
%>
This diff is collapsed.
Click to expand it.
app/views/notify/note_wall_email.text.erb
View file @
7008ace6
New message on the project wall
<%=
@note
.
project
%>
New message on the project wall
<%=
@note
.
project
%>
<%=
url_for
(
project_wall_url
(
@note
.
project
,
anchor:
"note_
#{
@note
.
id
}
"
))
%>
<%=
url_for
(
project_wall_url
(
@note
.
project
,
anchor:
"note_
#{
@note
.
id
}
"
))
%>
<%=
@note
.
author_name
%>
<%=
@note
.
author_name
%>
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/project_was_moved_email.text.erb
View file @
7008ace6
Project was moved to another location
Project was moved to another location
The project is now located under
The project is now located under
<%=
project_url
(
@project
)
%>
<%=
project_url
(
@project
)
%>
To update the remote url in your local repository run:
To update the remote url in your local repository run:
git remote set-url origin
<%=
@project
.
ssh_url_to_repo
%>
git remote set-url origin
<%=
@project
.
ssh_url_to_repo
%>
This diff is collapsed.
Click to expand it.
app/views/notify/reassigned_issue_email.html.haml
View file @
7008ace6
%p
%p
=
"Reassigned Issue #
#{
@issue
.
id
}
"
=
"Reassigned Issue #
#{
@issue
.
i
i
d
}
"
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
30
),
project_issue_url
(
@issue
.
project
,
@issue
)
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
30
),
project_issue_url
(
@issue
.
project
,
@issue
)
%p
%p
Assignee changed
Assignee changed
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/reassigned_issue_email.text.erb
View file @
7008ace6
Reassigned Issue
<%=
@issue
.
id
%>
Reassigned Issue
<%=
@issue
.
i
i
d
%>
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
))
%>
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
))
%>
Assignee changed
<%=
"from
#{
@previous_assignee
.
name
}
"
if
@previous_assignee
%>
to
<%=
@issue
.
assignee_name
%>
Assignee changed
<%=
"from
#{
@previous_assignee
.
name
}
"
if
@previous_assignee
%>
to
<%=
@issue
.
assignee_name
%>
This diff is collapsed.
Click to expand it.
app/views/notify/reassigned_merge_request_email.html.haml
View file @
7008ace6
%p
%p
=
"Reassigned Merge Request !
#{
@merge_request
.
id
}
"
=
"Reassigned Merge Request !
#{
@merge_request
.
i
i
d
}
"
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
30
),
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
30
),
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
%p
%p
Assignee changed
Assignee changed
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/reassigned_merge_request_email.text.erb
View file @
7008ace6
Reassigned Merge Request
<%=
@merge_request
.
id
%>
Reassigned Merge Request
<%=
@merge_request
.
i
i
d
%>
<%=
url_for
(
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
))
%>
<%=
url_for
(
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
))
%>
Assignee changed
<%=
"from
#{
@previous_assignee
.
name
}
"
if
@previous_assignee
%>
to
<%=
@merge_request
.
assignee_name
%>
Assignee changed
<%=
"from
#{
@previous_assignee
.
name
}
"
if
@previous_assignee
%>
to
<%=
@merge_request
.
assignee_name
%>
This diff is collapsed.
Click to expand it.
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