From 3f24f54061c728a75a1928a85e837e182d79f25f Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Mon, 31 Oct 2011 16:20:41 +0400 Subject: [PATCH 1/4] install letter_opener --- Gemfile | 1 + Gemfile.lock | 3 +++ config/environments/development.rb | 1 + 3 files changed, 5 insertions(+) diff --git a/Gemfile b/Gemfile index fc040ce0..8da55b10 100644 --- a/Gemfile +++ b/Gemfile @@ -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 83df35b5..f66e832e 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/config/environments/development.rb b/config/environments/development.rb index 9e5bf821..173bfc74 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 From 43c1039957f096c511f33cce05f988d4e108a0ff Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Mon, 31 Oct 2011 16:49:38 +0400 Subject: [PATCH 2/4] don't send notification to issue creator --- app/controllers/issues_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 26e4a573..083fa079 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -42,7 +42,9 @@ class IssuesController < ApplicationController @issue = @project.issues.new(params[:issue]) @issue.author = current_user if @issue.save - Notify.new_issue_email(@issue).deliver + @project.users.reject { |u| u.id == current_user.id } .each do |u| + Notify.new_issue_email(@issue).deliver + end end respond_with(@issue) From 3e95a6d73bb0817ec6869a5285d2e569d335e91b Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Mon, 31 Oct 2011 17:34:22 +0400 Subject: [PATCH 3/4] make commit messages multiline --- app/assets/stylesheets/projects.css.scss | 13 ++++++++----- app/views/commits/show.html.haml | 4 +++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index bde9aa5d..485a0888 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -411,7 +411,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td { text-shadow: #555 1px 1px; } -/** FALSH **/ +/** FLASH **/ #flash_container { height:40px; @@ -682,9 +682,9 @@ tbody tr:nth-child(2n) td, tbody tr.even td { } .top_panel_issues{ - #issue_search_form { - margin:5px 0; - input { + #issue_search_form { + margin:5px 0; + input { border:1px solid #D3D3D3; padding: 3px; height: 28px; @@ -693,10 +693,13 @@ tbody tr:nth-child(2n) td, tbody tr.even td { box-sizing: border-box; -moz-box-sizing: border-box; - &:focus { + &:focus { border-color:#c2e1ef; } } } } +pre.commit_message { + white-space: pre-wrap; +} diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml index 3beeada8..3227a447 100644 --- a/app/views/commits/show.html.haml +++ b/app/views/commits/show.html.haml @@ -16,7 +16,9 @@ %td= @commit.committed_date %tr %td Message - %td= @commit.safe_message + %td + %pre.commit_message + = preserve @commit.safe_message %tr %td Tree %td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id) From 11b70c97e3a49b6e6235f67452d56612fc141542 Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Mon, 31 Oct 2011 23:21:28 +0400 Subject: [PATCH 4/4] fix issue notification properly --- app/controllers/issues_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 083fa079..3aefb523 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -41,10 +41,8 @@ class IssuesController < ApplicationController def create @issue = @project.issues.new(params[:issue]) @issue.author = current_user - if @issue.save - @project.users.reject { |u| u.id == current_user.id } .each do |u| - Notify.new_issue_email(@issue).deliver - end + if @issue.save && @issue.assignee != current_user + Notify.new_issue_email(@issue).deliver end respond_with(@issue)