Commit babd0557 authored by gitlabhq's avatar gitlabhq

Merge branch 'dev' into new_layout

Conflicts:
	app/assets/stylesheets/projects.css.scss
parents e8d10b32 267bd606
...@@ -28,6 +28,7 @@ group :assets do ...@@ -28,6 +28,7 @@ group :assets do
end end
group :development do group :development do
gem 'letter_opener'
gem 'rails-footnotes', '>= 3.7.5.rc4' gem 'rails-footnotes', '>= 3.7.5.rc4'
gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git'
end end
......
...@@ -119,6 +119,8 @@ GEM ...@@ -119,6 +119,8 @@ GEM
rails (>= 3.0.0) rails (>= 3.0.0)
launchy (2.0.5) launchy (2.0.5)
addressable (~> 2.2.6) addressable (~> 2.2.6)
letter_opener (0.0.2)
launchy
libv8 (3.3.10.2) libv8 (3.3.10.2)
linecache19 (0.5.12) linecache19 (0.5.12)
ruby_core_source (>= 0.1.4) ruby_core_source (>= 0.1.4)
...@@ -262,6 +264,7 @@ DEPENDENCIES ...@@ -262,6 +264,7 @@ DEPENDENCIES
jquery-rails jquery-rails
kaminari kaminari
launchy launchy
letter_opener
pygments.rb (= 0.2.3) pygments.rb (= 0.2.3)
rails (= 3.1.0) rails (= 3.1.0)
rails-footnotes (>= 3.7.5.rc4) rails-footnotes (>= 3.7.5.rc4)
......
...@@ -364,7 +364,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td { ...@@ -364,7 +364,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
text-shadow: #555 1px 1px; text-shadow: #555 1px 1px;
} }
/** FALSH **/ /** FLASH **/
#flash_container { #flash_container {
height:40px; height:40px;
...@@ -636,9 +636,9 @@ tbody tr:nth-child(2n) td, tbody tr.even td { ...@@ -636,9 +636,9 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
} }
.top_panel_issues{ .top_panel_issues{
#issue_search_form { #issue_search_form {
margin:5px 0; margin:5px 0;
input { input {
border:1px solid #D3D3D3; border:1px solid #D3D3D3;
padding: 3px; padding: 3px;
height: 28px; height: 28px;
...@@ -647,7 +647,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td { ...@@ -647,7 +647,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
box-sizing: border-box; box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
&:focus { &:focus {
border-color:#c2e1ef; border-color:#c2e1ef;
} }
} }
...@@ -672,4 +672,6 @@ tbody tr:nth-child(2n) td, tbody tr.even td { ...@@ -672,4 +672,6 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
} }
.width-65p{ .width-65p{
width:65%; width:65%;
pre.commit_message {
white-space: pre-wrap;
} }
...@@ -42,7 +42,7 @@ class IssuesController < ApplicationController ...@@ -42,7 +42,7 @@ class IssuesController < ApplicationController
def create def create
@issue = @project.issues.new(params[:issue]) @issue = @project.issues.new(params[:issue])
@issue.author = current_user @issue.author = current_user
if @issue.save if @issue.save && @issue.assignee != current_user
Notify.new_issue_email(@issue).deliver Notify.new_issue_email(@issue).deliver
end end
......
...@@ -16,7 +16,9 @@ ...@@ -16,7 +16,9 @@
%td= @commit.committed_date %td= @commit.committed_date
%tr %tr
%td Message %td Message
%td= @commit.safe_message %td
%pre.commit_message
= preserve @commit.safe_message
%tr %tr
%td Tree %td Tree
%td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id) %td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id)
......
...@@ -29,4 +29,5 @@ Gitlab::Application.configure do ...@@ -29,4 +29,5 @@ Gitlab::Application.configure do
config.assets.debug = true config.assets.debug = true
config.action_mailer.default_url_options = { :host => 'localhost:3000' } config.action_mailer.default_url_options = { :host => 'localhost:3000' }
config.action_mailer.delivery_method = :letter_opener
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment