Merge branch 'ticket/master/8276'

sodabrew · Jul 13, 2011 · 5a3702d · 5a3702d
2 parents 9cf4f86 + 57d0122
commit 5a3702d
Show file tree

Hide file tree

Showing 196 changed files with 1 addition and 21,066 deletions.
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -10,6 +10,4 @@ def home
     @unchanged_nodes          = @all_nodes.unchanged
   end
 
-  def release_notes
-  end
 end
diff --git a/app/helpers/maruku_helper.rb b/app/helpers/maruku_helper.rb
diff --git a/app/views/pages/release_notes.html.haml b/app/views/pages/release_notes.html.haml
diff --git a/app/views/shared/_global_nav.html.haml b/app/views/shared/_global_nav.html.haml
@@ -6,7 +6,7 @@
     - else
       %a{:href => root_path, :id => "logo", :style => "text-indent: -9000px;"} Puppet Dashboard
   %li{:class => active_if(request.url == release_notes_url)}
-    = link_to "v#{APP_VERSION}", release_notes_path
+    = link_to "v#{APP_VERSION}", 'https://github.com/puppetlabs/puppet-dashboard'
   %li &raquo;
   %li{:class => active_if(request.url == root_url)}
     = link_to "Home", root_path

diff --git a/config/environment.rb b/config/environment.rb
@@ -16,7 +16,6 @@
   config.gem 'haml'
   config.gem 'sass'
   config.gem 'will_paginate'
-  config.gem 'maruku'
   config.gem 'daemons', :version => '1.0.10'
 
   # Change this to adjust log rotation. Logger.new(log_file, number_of_logs, max_log_size).

diff --git a/vendor/gems/maruku-0.6.0/.specification b/vendor/gems/maruku-0.6.0/.specification
diff --git a/vendor/gems/maruku-0.6.0/Rakefile b/vendor/gems/maruku-0.6.0/Rakefile
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,4 @@ def home @@
         @unchanged_nodes          = @all_nodes.unchanged
       end
-      def release_notes
-      end
     end