Skip to content

Commit

Permalink
Use persistent_settings 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
David Padilla committed Oct 11, 2012
1 parent 15592c1 commit 4f02efb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 26 deletions.
14 changes: 0 additions & 14 deletions Gemfile
@@ -1,19 +1,5 @@
source "http://rubygems.org"

# Declare your gem's dependencies in fundraiser.gemspec.
# Bundler will treat runtime dependencies like base dependencies, and
# development dependencies will be added by default to the :development group.
gemspec

# jquery-rails is used by the dummy application
gem "jquery-rails"
gem "persistent_settings", :git => 'git://github.com/dabit/persistent_settings.git',
:branch => '1-3'

# Declare any dependencies that are still in development here instead of in
# your gemspec. These might include edge Rails or gems from your path or
# Git. Remember to move these dependencies to your gemspec before releasing
# your gem to rubygems.org.

# To use debugger
# gem 'debugger'
15 changes: 4 additions & 11 deletions Gemfile.lock
@@ -1,19 +1,10 @@
GIT
remote: git://github.com/dabit/persistent_settings.git
revision: 2d4dfb967af8961595596c142ecc2c209da436c7
branch: 1-3
specs:
persistent_settings (1.3.0)
activerecord (~> 3.0)
railties (~> 3.0)

PATH
remote: .
specs:
fundraiser (0.0.1)
devise (~> 2.1.2)
haml-rails (~> 0.3.5)
persistent_settings
persistent_settings (~> 1.3.0)
rails (~> 3.2.8)

GEM
Expand Down Expand Up @@ -99,6 +90,9 @@ GEM
multi_json (1.3.6)
nokogiri (1.5.5)
orm_adapter (0.4.0)
persistent_settings (1.3.0)
activerecord (~> 3.0)
railties (~> 3.0)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
Expand Down Expand Up @@ -175,7 +169,6 @@ DEPENDENCIES
fundraiser!
jquery-rails
launchy
persistent_settings!
rspec-rails
sqlite3
vcr
Expand Down
2 changes: 1 addition & 1 deletion fundraiser.gemspec
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.add_dependency "rails", "~> 3.2.8"
s.add_dependency "devise", "~> 2.1.2"
s.add_dependency "haml-rails", "~> 0.3.5"
s.add_dependency "persistent_settings"
s.add_dependency "persistent_settings", "~> 1.3.0"

s.add_development_dependency "autotest"
s.add_development_dependency "autotest-growl"
Expand Down

0 comments on commit 4f02efb

Please sign in to comment.