From 07a6a195871576513b8b310b8d836230dfab3640 Mon Sep 17 00:00:00 2001 From: Surender Date: Fri, 15 Jul 2016 14:00:44 +0530 Subject: [PATCH 1/4] Changed the gem spec to get the 'city-state' from Mallow Tech repository --- Gemfile | 3 +++ country_state_select.gemspec | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3c32461..422958d 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,6 @@ source 'https://rubygems.org' # Specify your gem's dependencies in country_state_select.gemspec gemspec + +# Getting the 'city-state' gem from "Mallow Tech" repository +gem 'city-state', git: 'https://github.com/MallowTech/city-state.git' \ No newline at end of file diff --git a/country_state_select.gemspec b/country_state_select.gemspec index 67ab361..7ccd6f3 100644 --- a/country_state_select.gemspec +++ b/country_state_select.gemspec @@ -24,5 +24,4 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry' spec.add_runtime_dependency 'rails' - spec.add_runtime_dependency 'city-state' end From 85489565b6e6adf65d35589ea3659fb4e68cda39 Mon Sep 17 00:00:00 2001 From: Surender Date: Fri, 15 Jul 2016 15:21:06 +0530 Subject: [PATCH 2/4] added runtime dependency in gem spec --- country_state_select.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/country_state_select.gemspec b/country_state_select.gemspec index 7ccd6f3..67ab361 100644 --- a/country_state_select.gemspec +++ b/country_state_select.gemspec @@ -24,4 +24,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry' spec.add_runtime_dependency 'rails' + spec.add_runtime_dependency 'city-state' end From 7140b7c37132f66a750eff201f480ac7e623559c Mon Sep 17 00:00:00 2001 From: Surender Date: Fri, 15 Jul 2016 17:43:27 +0530 Subject: [PATCH 3/4] Changed the order --- Gemfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 422958d..112be31 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' -# Specify your gem's dependencies in country_state_select.gemspec -gemspec - # Getting the 'city-state' gem from "Mallow Tech" repository -gem 'city-state', git: 'https://github.com/MallowTech/city-state.git' \ No newline at end of file +gem 'city-state', git: 'https://github.com/MallowTech/city-state.git' + +# Specify your gem's dependencies in country_state_select.gemspec +gemspec \ No newline at end of file From b651ff8c333d838eaa78223702a822da02a54bf1 Mon Sep 17 00:00:00 2001 From: Surender Date: Fri, 15 Jul 2016 18:05:55 +0530 Subject: [PATCH 4/4] Reverted and resolved the changes --- Gemfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Gemfile b/Gemfile index 112be31..05b2f58 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,4 @@ source 'https://rubygems.org' -# Getting the 'city-state' gem from "Mallow Tech" repository -gem 'city-state', git: 'https://github.com/MallowTech/city-state.git' - # Specify your gem's dependencies in country_state_select.gemspec gemspec \ No newline at end of file