Skip to content

Commit 18443c4

Browse files
author
Matteo Giaccone
committed
Dependencies cleanup and update
1 parent 03ee80b commit 18443c4

File tree

3 files changed

+141
-152
lines changed

3 files changed

+141
-152
lines changed

‎Gemfile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
source "http://rubygems.org"
22

3-
# Declare your gem's dependencies in simple_form_fancy_uploads.gemspec.
4-
# Bundler will treat runtime dependencies like base dependencies, and
5-
# development dependencies will be added by default to the :development group.
3+
gem 'activeadmin', github: 'gregbell/active_admin'
64
gemspec
75

8-
if Dir.exists?(File.expand_path('~/code/gems'))
9-
gem 'railsyard-backend' , path: File.expand_path('~/code/gems/railsyard-backend')
10-
else
11-
gem 'railsyard-backend' , git: 'git://github.com/cantierecreativo/railsyard-backend.git', branch: 'develop'
12-
end
13-
146
group :development, :test do
157
gem 'simplecov', require: false
168
gem 'sqlite3'

‎Gemfile.lock

Lines changed: 139 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,139 @@
1-
PATH
2-
remote: .
3-
specs:
4-
railsyard-globalize (0.0.2)
5-
globalize3
6-
rails (~> 3.2.1)
7-
railsyard-backend
8-
9-
PATH
10-
remote: /Users/steffoz/code/gems/railsyard-backend
1+
GIT
2+
remote: git://github.com/gregbell/active_admin.git
3+
revision: 5ba39c0c85920ddfc5be9985a8c0c9310da1f878
114
specs:
12-
railsyard-backend (3.0.pre)
13-
blockenspiel
14-
cells
5+
activeadmin (1.0.0.pre)
6+
arbre (~> 1.0)
7+
bourbon
158
coffee-rails
16-
compass-rails
17-
formalize-rails
18-
humane-rails (= 2.8.0.0.1.2)
9+
devise (~> 3.2)
10+
formtastic (~> 2.3.0.rc2)
11+
inherited_resources (~> 1.3)
1912
jquery-rails
20-
kaminari
21-
rails
22-
responders
13+
jquery-ui-rails
14+
kaminari (~> 0.14, != 0.15.0)
15+
rails (>= 3.2, < 4.1)
16+
ransack (~> 1.0)
2317
sass-rails
24-
simple_form
25-
slim-rails
18+
19+
PATH
20+
remote: .
21+
specs:
22+
activeadmin-globalize3 (0.0.2)
23+
globalize (~> 4.0.0)
2624

2725
GEM
2826
remote: http://rubygems.org/
2927
specs:
30-
actionmailer (3.2.1)
31-
actionpack (= 3.2.1)
32-
mail (~> 2.4.0)
33-
actionpack (3.2.1)
34-
activemodel (= 3.2.1)
35-
activesupport (= 3.2.1)
36-
builder (~> 3.0.0)
28+
actionmailer (4.0.2)
29+
actionpack (= 4.0.2)
30+
mail (~> 2.5.4)
31+
actionpack (4.0.2)
32+
activesupport (= 4.0.2)
33+
builder (~> 3.1.0)
3734
erubis (~> 2.7.0)
38-
journey (~> 1.0.1)
39-
rack (~> 1.4.0)
40-
rack-cache (~> 1.1)
41-
rack-test (~> 0.6.1)
42-
sprockets (~> 2.1.2)
43-
activemodel (3.2.1)
44-
activesupport (= 3.2.1)
45-
builder (~> 3.0.0)
46-
activerecord (3.2.1)
47-
activemodel (= 3.2.1)
48-
activesupport (= 3.2.1)
49-
arel (~> 3.0.0)
50-
tzinfo (~> 0.3.29)
51-
activeresource (3.2.1)
52-
activemodel (= 3.2.1)
53-
activesupport (= 3.2.1)
54-
activesupport (3.2.1)
55-
i18n (~> 0.6)
56-
multi_json (~> 1.0)
57-
arel (3.0.2)
58-
blockenspiel (0.4.5)
59-
builder (3.0.0)
60-
cells (3.8.5)
61-
actionpack (~> 3.0)
62-
railties (~> 3.0)
63-
chunky_png (1.2.6)
64-
coffee-rails (3.2.2)
35+
rack (~> 1.5.2)
36+
rack-test (~> 0.6.2)
37+
activemodel (4.0.2)
38+
activesupport (= 4.0.2)
39+
builder (~> 3.1.0)
40+
activerecord (4.0.2)
41+
activemodel (= 4.0.2)
42+
activerecord-deprecated_finders (~> 1.0.2)
43+
activesupport (= 4.0.2)
44+
arel (~> 4.0.0)
45+
activerecord-deprecated_finders (1.0.3)
46+
activesupport (4.0.2)
47+
i18n (~> 0.6, >= 0.6.4)
48+
minitest (~> 4.2)
49+
multi_json (~> 1.3)
50+
thread_safe (~> 0.1)
51+
tzinfo (~> 0.3.37)
52+
arbre (1.0.1)
53+
activesupport (>= 3.0.0)
54+
arel (4.0.1)
55+
atomic (1.1.14)
56+
bcrypt-ruby (3.1.2)
57+
bourbon (3.1.8)
58+
sass (>= 3.2.0)
59+
thor
60+
builder (3.1.4)
61+
coffee-rails (4.0.1)
6562
coffee-script (>= 2.2.0)
66-
railties (~> 3.2.0)
63+
railties (>= 4.0.0, < 5.0)
6764
coffee-script (2.2.0)
6865
coffee-script-source
6966
execjs
70-
coffee-script-source (1.3.3)
71-
compass (0.12.2)
72-
chunky_png (~> 1.2)
73-
fssm (>= 0.2.7)
74-
sass (~> 3.1)
75-
compass-rails (1.0.3)
76-
compass (>= 0.12.2, < 0.14)
67+
coffee-script-source (1.6.3)
68+
devise (3.2.2)
69+
bcrypt-ruby (~> 3.0)
70+
orm_adapter (~> 0.1)
71+
railties (>= 3.2.6, < 5)
72+
thread_safe (~> 0.1)
73+
warden (~> 1.2.3)
7774
diff-lcs (1.1.3)
75+
docile (1.1.2)
7876
erubis (2.7.0)
79-
execjs (1.4.0)
80-
multi_json (~> 1.0)
81-
formalize-rails (0.1.3)
82-
railties (~> 3.1)
83-
friendly_id (4.0.8)
84-
fssm (0.2.9)
85-
globalize3 (0.2.0)
86-
activemodel (>= 3.0.0)
87-
activerecord (>= 3.0.0)
88-
paper_trail (~> 2)
89-
hike (1.2.1)
90-
humane-rails (2.8.0.0.1.2)
91-
i18n (0.6.0)
92-
journey (1.0.1)
93-
jquery-rails (2.1.2)
94-
railties (>= 3.1.0, < 5.0)
95-
thor (~> 0.14)
96-
json (1.6.5)
77+
execjs (2.0.2)
78+
formtastic (2.3.0.rc2)
79+
actionpack (>= 3.0)
80+
friendly_id (5.0.2)
81+
activerecord (~> 4.0.0)
82+
globalize (4.0.0)
83+
activemodel (>= 4.0.0, < 5)
84+
activerecord (>= 4.0.0, < 5)
85+
has_scope (0.6.0.rc)
86+
actionpack (>= 3.2, < 5)
87+
activesupport (>= 3.2, < 5)
88+
hike (1.2.3)
89+
i18n (0.6.9)
90+
inherited_resources (1.4.1)
91+
has_scope (~> 0.6.0.rc)
92+
responders (~> 1.0.0.rc)
93+
jquery-rails (3.0.4)
94+
railties (>= 3.0, < 5.0)
95+
thor (>= 0.14, < 2.0)
96+
jquery-ui-rails (4.1.1)
97+
railties (>= 3.1.0)
9798
kaminari (0.14.1)
9899
actionpack (>= 3.0.0)
99100
activesupport (>= 3.0.0)
100-
mail (2.4.4)
101-
i18n (>= 0.4.0)
101+
mail (2.5.4)
102102
mime-types (~> 1.16)
103103
treetop (~> 1.4.8)
104-
mime-types (1.19)
105-
multi_json (1.0.4)
106-
nokogiri (1.5.0)
107-
paper_trail (2.6.3)
108-
activerecord (~> 3.0)
109-
railties (~> 3.0)
104+
mime-types (1.25.1)
105+
mini_portile (0.5.2)
106+
minitest (4.7.5)
107+
multi_json (1.8.4)
108+
nokogiri (1.6.1)
109+
mini_portile (~> 0.5.0)
110+
orm_adapter (0.5.0)
111+
polyamorous (0.6.4)
112+
activerecord (>= 3.0)
110113
polyglot (0.3.3)
111-
rack (1.4.1)
112-
rack-cache (1.1)
113-
rack (>= 0.4)
114-
rack-ssl (1.3.2)
115-
rack
116-
rack-test (0.6.1)
114+
rack (1.5.2)
115+
rack-test (0.6.2)
117116
rack (>= 1.0)
118-
rails (3.2.1)
119-
actionmailer (= 3.2.1)
120-
actionpack (= 3.2.1)
121-
activerecord (= 3.2.1)
122-
activeresource (= 3.2.1)
123-
activesupport (= 3.2.1)
124-
bundler (~> 1.0)
125-
railties (= 3.2.1)
126-
railties (3.2.1)
127-
actionpack (= 3.2.1)
128-
activesupport (= 3.2.1)
129-
rack-ssl (~> 1.3.2)
117+
rails (4.0.2)
118+
actionmailer (= 4.0.2)
119+
actionpack (= 4.0.2)
120+
activerecord (= 4.0.2)
121+
activesupport (= 4.0.2)
122+
bundler (>= 1.3.0, < 2.0)
123+
railties (= 4.0.2)
124+
sprockets-rails (~> 2.0.0)
125+
railties (4.0.2)
126+
actionpack (= 4.0.2)
127+
activesupport (= 4.0.2)
130128
rake (>= 0.8.7)
131-
rdoc (~> 3.4)
132-
thor (~> 0.14.6)
133-
rake (0.9.2.2)
134-
rdoc (3.12)
135-
json (~> 1.4)
136-
responders (0.9.2)
137-
railties (~> 3.1)
129+
thor (>= 0.18.1, < 2.0)
130+
rake (10.1.1)
131+
ransack (1.1.0)
132+
actionpack (>= 3.0)
133+
activerecord (>= 3.0)
134+
polyamorous (~> 0.6.0)
135+
responders (1.0.0)
136+
railties (>= 3.2, < 5)
138137
rspec (2.8.0)
139138
rspec-core (~> 2.8.0)
140139
rspec-expectations (~> 2.8.0)
@@ -148,38 +147,36 @@ GEM
148147
activesupport (>= 3.0)
149148
railties (>= 3.0)
150149
rspec (~> 2.8.0)
151-
sass (3.2.1)
152-
sass-rails (3.2.5)
153-
railties (~> 3.2.0)
150+
sass (3.2.13)
151+
sass-rails (4.0.1)
152+
railties (>= 4.0.0, < 5.0)
154153
sass (>= 3.1.10)
155-
tilt (~> 1.3)
156-
simple_form (2.0.2)
157-
actionpack (~> 3.0)
158-
activemodel (~> 3.0)
159-
simplecov (0.5.4)
160-
multi_json (~> 1.0.3)
161-
simplecov-html (~> 0.5.3)
162-
simplecov-html (0.5.3)
163-
slim (1.3.0)
164-
temple (~> 0.4.1)
165-
tilt (~> 1.3.3)
166-
slim-rails (1.0.3)
167-
actionpack (~> 3.0)
168-
activesupport (~> 3.0)
169-
railties (~> 3.0)
170-
slim (~> 1.0)
171-
sprockets (2.1.2)
154+
sprockets-rails (~> 2.0.0)
155+
simplecov (0.8.2)
156+
docile (~> 1.1.0)
157+
multi_json
158+
simplecov-html (~> 0.8.0)
159+
simplecov-html (0.8.0)
160+
sprockets (2.10.1)
172161
hike (~> 1.2)
162+
multi_json (~> 1.0)
173163
rack (~> 1.0)
174164
tilt (~> 1.1, != 1.3.0)
175-
sqlite3 (1.3.5)
176-
temple (0.4.1)
177-
thor (0.14.6)
178-
tilt (1.3.3)
179-
treetop (1.4.10)
165+
sprockets-rails (2.0.1)
166+
actionpack (>= 3.0)
167+
activesupport (>= 3.0)
168+
sprockets (~> 2.8)
169+
sqlite3 (1.3.8)
170+
thor (0.18.1)
171+
thread_safe (0.1.3)
172+
atomic
173+
tilt (1.4.1)
174+
treetop (1.4.15)
180175
polyglot
181176
polyglot (>= 0.3.1)
182-
tzinfo (0.3.33)
177+
tzinfo (0.3.38)
178+
warden (1.2.3)
179+
rack (>= 1.0)
183180
webrat (0.7.3)
184181
nokogiri (>= 1.2.0)
185182
rack (>= 1.0)
@@ -189,9 +186,9 @@ PLATFORMS
189186
ruby
190187

191188
DEPENDENCIES
189+
activeadmin!
190+
activeadmin-globalize3!
192191
friendly_id
193-
railsyard-backend!
194-
railsyard-globalize!
195192
rspec-rails (~> 2.8.1)
196193
simplecov
197194
sqlite3

‎activeadmin-globalize3.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
1616
s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
1717

1818
s.add_dependency "activeadmin"
19-
s.add_dependency "globalize"
19+
s.add_dependency "globalize", '~> 4.0.0'
2020
end
2121

0 commit comments

Comments
 (0)