Skip to content

Commit

Permalink
Merge pull request #117 from scudco/upgrade-countries
Browse files Browse the repository at this point in the history 
Upgrade to countries 1.2
  • Loading branch information
@scudco
scudco committed Nov 6, 2015
2 parents 2023cc8 + 689467d commit 5877230
Show file tree
Hide file tree
Showing 8 changed files with 137 additions and 133 deletions.
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
@@ -1,8 +1,8 @@
PATH
remote: .
specs:
country_select (2.3.0)
countries (~> 1.1.0)
country_select (2.4.0)
countries (~> 1.2.0)
sort_alphabetical (~> 1.0)

GEM
Expand All @@ -26,7 +26,7 @@ GEM
multi_json (~> 1.0)
builder (3.0.4)
coderay (1.1.0)
countries (1.1.0)
countries (1.2.1)
currencies (~> 0.4.2)
i18n_data (~> 0.7.0)
currencies (0.4.2)
Expand Down
2 changes: 1 addition & 1 deletion country_select.gemspec
View file
Expand Up @@ -25,6 +25,6 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rspec', '~> 3'
s.add_development_dependency 'wwtd'

s.add_dependency 'countries', '~> 1.1.0'
s.add_dependency 'countries', '~> 1.2.0'
s.add_dependency 'sort_alphabetical', '~> 1.0'
end
4 changes: 2 additions & 2 deletions gemfiles/actionpack.edge.gemfile.lock
View file
Expand Up @@ -26,15 +26,15 @@ PATH
remote: ../
specs:
country_select (2.4.0)
countries (~> 1.1.0)
countries (~> 1.2.0)
sort_alphabetical (~> 1.0)

GEM
remote: https://rubygems.org/
specs:
builder (3.2.2)
coderay (1.1.0)
countries (1.1.0)
countries (1.2.1)
currencies (~> 0.4.2)
i18n_data (~> 0.7.0)
currencies (0.4.2)
Expand Down
61 changes: 31 additions & 30 deletions gemfiles/actionpack3.2.gemfile.lock
View file
Expand Up @@ -2,31 +2,31 @@ PATH
remote: ../
specs:
country_select (2.4.0)
countries (~> 1.1.0)
countries (~> 1.2.0)
sort_alphabetical (~> 1.0)

GEM
remote: https://rubygems.org/
specs:
actionpack (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
actionpack (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.21)
activesupport (= 3.2.21)
activemodel (3.2.22)
activesupport (= 3.2.22)
builder (~> 3.0.0)
activesupport (3.2.21)
activesupport (3.2.22)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
builder (3.0.4)
coderay (1.1.0)
countries (1.1.0)
countries (1.2.1)
currencies (~> 0.4.2)
i18n_data (~> 0.7.0)
currencies (0.4.2)
Expand All @@ -38,31 +38,32 @@ GEM
i18n_data (0.7.0)
journey (1.0.4)
method_source (0.8.2)
multi_json (1.10.1)
pry (0.10.1)
multi_json (1.11.2)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
psych (2.0.12)
racc (1.4.12)
rack (1.4.5)
rack-cache (1.2)
psych (2.0.15)
racc (1.4.13)
rack (1.4.7)
rack-cache (1.5.1)
rack (>= 0.4)
rack-test (0.6.3)
rack (>= 1.0)
rake (10.4.2)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rubysl (2.1.0)
rubysl-abbrev (~> 2.0)
rubysl-base64 (~> 2.0)
Expand Down Expand Up @@ -169,7 +170,7 @@ GEM
rubysl-curses (2.0.1)
rubysl-date (2.0.9)
rubysl-delegate (2.0.1)
rubysl-digest (2.0.3)
rubysl-digest (2.0.8)
rubysl-drb (2.0.1)
rubysl-e2mmap (2.0.0)
rubysl-english (2.0.0)
Expand Down Expand Up @@ -219,7 +220,7 @@ GEM
rubysl-observer (2.0.0)
rubysl-open-uri (2.0.0)
rubysl-open3 (2.0.0)
rubysl-openssl (2.2.1)
rubysl-openssl (2.3.1)
rubysl-optparse (2.0.1)
rubysl-shellwords (~> 2.0)
rubysl-ostruct (2.0.4)
Expand All @@ -231,7 +232,7 @@ GEM
rubysl-pstore (2.0.0)
rubysl-pty (2.0.3)
rubysl-rational (2.0.1)
rubysl-resolv (2.1.0)
rubysl-resolv (2.1.2)
rubysl-rexml (2.0.4)
rubysl-rinda (2.0.1)
rubysl-rss (2.0.0)
Expand All @@ -247,7 +248,7 @@ GEM
rubysl-syslog (2.1.0)
ffi2-generators (~> 0.1)
rubysl-tempfile (2.0.1)
rubysl-thread (2.0.2)
rubysl-thread (2.0.3)
rubysl-thwait (2.0.0)
rubysl-time (2.0.3)
rubysl-timeout (2.0.0)
Expand All @@ -272,7 +273,7 @@ GEM
tilt (~> 1.1, != 1.3.0)
tilt (1.4.1)
unicode_utils (1.4.0)
wwtd (0.7.0)
wwtd (1.1.1)

PLATFORMS
ruby
Expand Down
51 changes: 26 additions & 25 deletions gemfiles/actionpack4.0.gemfile.lock
View file
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ../
specs:
country_select (2.4.0)
countries (~> 1.1.0)
countries (~> 1.2.0)
sort_alphabetical (~> 1.0)

GEM
Expand All @@ -22,7 +22,7 @@ GEM
tzinfo (~> 0.3.37)
builder (3.1.4)
coderay (1.1.0)
countries (1.1.0)
countries (1.2.1)
currencies (~> 0.4.2)
i18n_data (~> 0.7.0)
currencies (0.4.2)
Expand All @@ -33,29 +33,30 @@ GEM
i18n_data (0.7.0)
method_source (0.8.2)
minitest (4.7.5)
multi_json (1.10.1)
pry (0.10.1)
multi_json (1.11.2)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
psych (2.0.12)
racc (1.4.12)
rack (1.5.2)
psych (2.0.15)
racc (1.4.13)
rack (1.5.5)
rack-test (0.6.3)
rack (>= 1.0)
rake (10.4.2)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rubysl (2.1.0)
rubysl-abbrev (~> 2.0)
rubysl-base64 (~> 2.0)
Expand Down Expand Up @@ -162,7 +163,7 @@ GEM
rubysl-curses (2.0.1)
rubysl-date (2.0.9)
rubysl-delegate (2.0.1)
rubysl-digest (2.0.3)
rubysl-digest (2.0.8)
rubysl-drb (2.0.1)
rubysl-e2mmap (2.0.0)
rubysl-english (2.0.0)
Expand Down Expand Up @@ -212,7 +213,7 @@ GEM
rubysl-observer (2.0.0)
rubysl-open-uri (2.0.0)
rubysl-open3 (2.0.0)
rubysl-openssl (2.2.1)
rubysl-openssl (2.3.1)
rubysl-optparse (2.0.1)
rubysl-shellwords (~> 2.0)
rubysl-ostruct (2.0.4)
Expand All @@ -224,7 +225,7 @@ GEM
rubysl-pstore (2.0.0)
rubysl-pty (2.0.3)
rubysl-rational (2.0.1)
rubysl-resolv (2.1.0)
rubysl-resolv (2.1.2)
rubysl-rexml (2.0.4)
rubysl-rinda (2.0.1)
rubysl-rss (2.0.0)
Expand All @@ -240,7 +241,7 @@ GEM
rubysl-syslog (2.1.0)
ffi2-generators (~> 0.1)
rubysl-tempfile (2.0.1)
rubysl-thread (2.0.2)
rubysl-thread (2.0.3)
rubysl-thwait (2.0.0)
rubysl-time (2.0.3)
rubysl-timeout (2.0.0)
Expand All @@ -258,10 +259,10 @@ GEM
slop (3.6.0)
sort_alphabetical (1.0.2)
unicode_utils (>= 1.2.2)
thread_safe (0.3.4)
tzinfo (0.3.43)
thread_safe (0.3.5)
tzinfo (0.3.45)
unicode_utils (1.4.0)
wwtd (0.7.0)
wwtd (1.1.1)

PLATFORMS
ruby
Expand Down

0 comments on commit 5877230

Please sign in to comment.