Skip to content
This repository was archived by the owner on Nov 30, 2018. It is now read-only.

Commit df66b4d

Browse files
committed
Updated gem requirements
1 parent e741bea commit df66b4d

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

Gemfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,21 @@ gemspec
1414
# gem 'debugger'
1515

1616
# Gems used by the dummy application
17-
group :assets do
18-
gem 'sass-rails', '~> 3.2.3'
19-
gem 'coffee-rails', '~> 3.2.1'
17+
gem 'rails', '~> 4.0.0'
18+
gem 'sass-rails'
19+
gem 'coffee-rails'
2020

21-
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
22-
gem 'therubyracer', platforms: :ruby
23-
24-
gem 'uglifier', '>= 1.0.3'
25-
end
21+
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
22+
gem 'therubyracer', platforms: :ruby
23+
gem 'uglifier'
2624

2725
# jquery-rails is
2826
gem 'jquery-rails'
2927

28+
# Fetch activeadmin from github until is released
29+
gem 'activeadmin', github: 'activeadmin'
30+
gem 'devise'
31+
3032
group :test do
3133
gem 'sqlite3', '~> 1.3.5'
3234
gem 'rspec-rails', '~> 2.14.0'

activeadmin-globalize.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
1515

1616
s.files = Dir['{app,config,db,lib}/**/*'] + %w(MIT-LICENSE README.md)
1717

18-
s.add_dependency 'activeadmin', '~> 0.6.3'
19-
s.add_dependency 'globalize', '~> 3.0.4'
18+
s.add_dependency 'activeadmin', '~> 1.0.0.pre'
19+
s.add_dependency 'globalize', '~> 4.0'
2020

2121
# development dependencies
2222
s.add_development_dependency 'bundler', '>= 1.6.1'

lib/active_admin/globalize/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module ActiveAdmin
22
module Globalize
3-
VERSION = '0.6.3'
3+
VERSION = '1.0.0.pre'
44
end
55
end
66

0 commit comments

Comments
 (0)