Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

f011b86b

Commit f011b86b authored 8 years ago by Robert Speicher

Downloads
- Plain Diff

Merge branch 'rs-devise-emails' into 'master'

Customize all Devise mails

Continuing from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3354

See merge request !4297

parents e71c6414 f63bc822

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
app/assets/stylesheets/mailers/devise.scss 4 additions, 0 deletions

app/assets/stylesheets/mailers/devise.scss
app/views/devise/mailer/password_change.html.haml 10 additions, 0 deletions

app/views/devise/mailer/password_change.html.haml
app/views/devise/mailer/password_change.text.erb 7 additions, 0 deletions

app/views/devise/mailer/password_change.text.erb
app/views/devise/mailer/reset_password_instructions.html.erb 0 additions, 8 deletions

app/views/devise/mailer/reset_password_instructions.html.erb
app/views/devise/mailer/reset_password_instructions.html.haml 12 additions, 0 deletions

...views/devise/mailer/reset_password_instructions.html.haml
app/views/devise/mailer/reset_password_instructions.text.erb 10 additions, 0 deletions

app/views/devise/mailer/reset_password_instructions.text.erb
app/views/devise/mailer/unlock_instructions.html.haml 9 additions, 10 deletions

app/views/devise/mailer/unlock_instructions.html.haml
app/views/devise/mailer/unlock_instructions.text.erb 7 additions, 0 deletions

app/views/devise/mailer/unlock_instructions.text.erb
spec/mailers/previews/devise_mailer_preview.rb 21 additions, 2 deletions

spec/mailers/previews/devise_mailer_preview.rb

with 81 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment