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/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index e60dc701..66db914a 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -364,7 +364,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td { text-shadow: #555 1px 1px; } -/** FALSH **/ +/** FLASH **/ #flash_container { height:40px; @@ -636,9 +636,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; @@ -647,7 +647,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td { box-sizing: border-box; -moz-box-sizing: border-box; - &:focus { + &:focus { border-color:#c2e1ef; } } @@ -672,4 +672,6 @@ tbody tr:nth-child(2n) td, tbody tr.even td { } .width-65p{ width:65%; +pre.commit_message { + white-space: pre-wrap; } diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 2966f9e4..71c559a1 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -42,7 +42,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/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) 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