Skip to content

GitLab Next

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab FOSS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Releases
- Model registry
- 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

f0bdf7f8

There was a problem fetching the pipeline summary.

Commit f0bdf7f8 authored 9 years ago by Robert Speicher

Downloads
- Plain Diff

Merge branch 'reply-by-email' into 'master'

Reply by email

Fixes #1360.

It's far from done, but _it works_.

See merge request !1173

parents 0daa21ed 15fc7bd6

No related branches found

No related tags found

Loading

Pipeline #

Changes 63
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
Gemfile 4 additions, 0 deletions

Gemfile
Gemfile.lock 4 additions, 0 deletions

Gemfile.lock
Procfile 2 additions, 1 deletion

Procfile
app/helpers/icons_helper.rb 1 addition, 1 deletion

app/helpers/icons_helper.rb
app/mailers/base_mailer.rb 32 additions, 0 deletions

app/mailers/base_mailer.rb
app/mailers/email_rejection_mailer.rb 19 additions, 0 deletions

app/mailers/email_rejection_mailer.rb
app/mailers/emails/issues.rb 8 additions, 0 deletions

app/mailers/emails/issues.rb
app/mailers/emails/merge_requests.rb 10 additions, 42 deletions

app/mailers/emails/merge_requests.rb
app/mailers/emails/notes.rb 6 additions, 0 deletions

app/mailers/emails/notes.rb
app/mailers/notify.rb 33 additions, 40 deletions

app/mailers/notify.rb
app/models/sent_notification.rb 50 additions, 0 deletions

app/models/sent_notification.rb
app/services/projects/upload_service.rb 3 additions, 3 deletions

app/services/projects/upload_service.rb
app/views/admin/dashboard/index.html.haml 4 additions, 0 deletions

app/views/admin/dashboard/index.html.haml
app/views/email_rejection_mailer/rejection.html.haml 4 additions, 0 deletions

app/views/email_rejection_mailer/rejection.html.haml
app/views/email_rejection_mailer/rejection.text.haml 4 additions, 0 deletions

app/views/email_rejection_mailer/rejection.text.haml
app/views/layouts/notify.html.haml 5 additions, 1 deletion

app/views/layouts/notify.html.haml
app/workers/email_receiver_worker.rb 49 additions, 0 deletions

app/workers/email_receiver_worker.rb
bin/background_jobs 1 addition, 1 deletion

bin/background_jobs
bin/mail_room 52 additions, 0 deletions

bin/mail_room

with 292 additions and 89 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