Merge branch 'ajaxreload'

Conflicts: Gemfile app/views/projects/show.html.haml public/stylesheets/master.css
nordringrayhide · Dec 21, 2010 · 6d3aa74 · 6d3aa74
2 parents 5593359 + d89db5e
commit 6d3aa74
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -9,6 +9,7 @@ gem "open4"
 gem "json"
 gem 'jquery-rails'
 
+
 #xmpp notifications
 gem "xmpp4r-simple"
 
@@ -29,6 +30,7 @@ group :development, :test do
   gem "mocha"
   gem "database_cleaner"
   gem "crack"
+
 
   platforms :mri_18 do
     gem "ruby-debug"

diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
@@ -9,7 +9,6 @@
       %td.title Branch
       %td.value= @project.vcs_branch
   %br
-
   = render :partial => 'builds'
 
 

diff --git a/public/stylesheets/master.css b/public/stylesheets/master.css
@@ -61,4 +61,5 @@ a                              { color: #000; text-decoration: none; }
 
 form button                    { border: 0; }
 
-/*#ajax-reload                   { display:none; }*/
+
+#ajax-reload                   { display:none; }