Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

G

gitlabhq1
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- 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

5b8712e4

An error occurred while retrieving diff files

Commit 5b8712e4 authored 9 years ago by Dmitriy Zaporozhets

Downloads
- Plain Diff

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 0384d292 dc76d102

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/mailers/devise_mailer.rb 2 additions, 2 deletions

app/mailers/devise_mailer.rb
app/mailers/emails/projects.rb 1 addition, 1 deletion

app/mailers/emails/projects.rb
app/mailers/notify.rb 4 additions, 4 deletions

app/mailers/notify.rb
config/gitlab.teatro.yml 2 additions, 5 deletions

config/gitlab.teatro.yml
config/gitlab.yml.example 11 additions, 56 deletions

config/gitlab.yml.example
config/initializers/1_settings.rb 4 additions, 20 deletions

config/initializers/1_settings.rb
config/initializers/disable_email_interceptor.rb 1 addition, 3 deletions

config/initializers/disable_email_interceptor.rb
config/initializers/email_settings.rb 0 additions, 5 deletions

config/initializers/email_settings.rb
config/initializers/smtp_settings.rb.sample 22 additions, 0 deletions

config/initializers/smtp_settings.rb.sample
lib/tasks/gitlab/check.rake 1 addition, 1 deletion

lib/tasks/gitlab/check.rake
spec/mailers/notify_spec.rb 3 additions, 3 deletions

spec/mailers/notify_spec.rb

with 51 additions and 100 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