diff options
author | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-10-31 23:37:09 +0400 |
---|---|---|
committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-10-31 23:37:09 +0400 |
commit | 267bd6068c7a57316ef357f9385e12fea6c8d69f (patch) | |
tree | 000683b89599a7995ab5dafa6100baf3da565d2b | |
parent | 3e95a6d73bb0817ec6869a5285d2e569d335e91b (diff) | |
parent | 11b70c97e3a49b6e6235f67452d56612fc141542 (diff) |
Merge branch 'issue-101' into dev
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | Gemfile.lock | 3 | ||||
-rw-r--r-- | app/controllers/issues_controller.rb | 2 | ||||
-rw-r--r-- | config/environments/development.rb | 1 |
4 files changed, 6 insertions, 1 deletions
@@ -28,6 +28,7 @@ group :assets do end group :development do + gem 'letter_opener' gem 'rails-footnotes', '>= 3.7.5.rc4' gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' end diff --git a/Gemfile.lock b/Gemfile.lock index 83df35b52af..f66e832e4a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,6 +119,8 @@ GEM rails (>= 3.0.0) launchy (2.0.5) addressable (~> 2.2.6) + letter_opener (0.0.2) + launchy libv8 (3.3.10.2) linecache19 (0.5.12) ruby_core_source (>= 0.1.4) @@ -262,6 +264,7 @@ DEPENDENCIES jquery-rails kaminari launchy + letter_opener pygments.rb (= 0.2.3) rails (= 3.1.0) rails-footnotes (>= 3.7.5.rc4) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index d0fad8ed647..722a0df219c 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -41,7 +41,7 @@ class IssuesController < ApplicationController def create @issue = @project.issues.new(params[:issue]) @issue.author = current_user - if @issue.save + if @issue.save && @issue.assignee != current_user Notify.new_issue_email(@issue).deliver end diff --git a/config/environments/development.rb b/config/environments/development.rb index 9e5bf8215e7..173bfc74c7c 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -29,4 +29,5 @@ Gitlab::Application.configure do config.assets.debug = true config.action_mailer.default_url_options = { :host => 'localhost:3000' } + config.action_mailer.delivery_method = :letter_opener end |