Author: assaf
Date: Thu Jun 19 16:02:04 2008
New Revision: 669738
URL: http://svn.apache.org/viewvc?rev=669738&view=rev
Log:
Merge commit '5c61efb0bfa57970564a8ed4dacc4781e97b44eb'
Conflicts:
config/initializers/libs.rb
Added:
ode/sandbox/singleshot/config/initializers/singleshot.rb
Modified:
ode/sandbox/singleshot/app/helpers/application_helper.rb
ode/sandbox/singleshot/config/environment.rb
ode/sandbox/singleshot/config/initializers/libs.rb
Modified: ode/sandbox/singleshot/app/helpers/application_helper.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/helpers/application_helper.rb?rev=669738&r1=669737&r2=669738&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/helpers/application_helper.rb (original)
+++ ode/sandbox/singleshot/app/helpers/application_helper.rb Thu Jun 19
16:02:04 2008
@@ -1,8 +1,6 @@
# Methods added to this helper will be available to all templates in the
application.
module ApplicationHelper
- include SparklinesHelper
-
# Returns a link to a person using their full name as the link text and site
URL
# (or profile, if unspecified) as the reference.
def link_to_person(person, options = {})
Modified: ode/sandbox/singleshot/config/environment.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/environment.rb?rev=669738&r1=669737&r2=669738&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/environment.rb (original)
+++ ode/sandbox/singleshot/config/environment.rb Thu Jun 19 16:02:04 2008
@@ -10,6 +10,7 @@
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
+
Rails::Initializer.run do |config|
# Settings in config/environments/* take precedence over those specified
here.
# Application configuration should go into files in config/initializers
Modified: ode/sandbox/singleshot/config/initializers/libs.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/initializers/libs.rb?rev=669738&r1=669737&r2=669738&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/initializers/libs.rb (original)
+++ ode/sandbox/singleshot/config/initializers/libs.rb Thu Jun 19 16:02:04 2008
@@ -2,3 +2,8 @@
require File.join(Rails.root, 'lib/patches')
require File.join(Rails.root, 'lib/extensions')
require File.join(Rails.root, 'lib/singleshot')
+
+require 'sparklines'
+module ApplicationHelper
+ include SparklinesHelper
+end
Added: ode/sandbox/singleshot/config/initializers/singleshot.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/initializers/singleshot.rb?rev=669738&view=auto
==============================================================================
--- ode/sandbox/singleshot/config/initializers/singleshot.rb (added)
+++ ode/sandbox/singleshot/config/initializers/singleshot.rb Thu Jun 19
16:02:04 2008
@@ -0,0 +1,5 @@
+module Singleshot
+
+ VERSION = '0.1'.freeze
+
+end
