gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
Aditya Chatterjee 2016-03-01 18:56:12 +05:30
commit 1e9f4b514c
20 changed files with 193 additions and 3786 deletions
Download patch file Download diff file Expand all files Collapse all files

65
Gemfile.lock
View file

@ -9,6 +9,7 @@ GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
<<<<<<< HEAD
actionmailer (4.2.5.1)
actionpack (= 4.2.5.1)
actionview (= 4.2.5.1)
@ -18,18 +19,35 @@ GEM
actionpack (4.2.5.1)
actionview (= 4.2.5.1)
activesupport (= 4.2.5.1)
=======
actionmailer (4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5.2)
actionview (= 4.2.5.2)
activesupport (= 4.2.5.2)
>>>>>>> upstream/master
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
<<<<<<< HEAD
actionview (4.2.5.1)
activesupport (= 4.2.5.1)
=======
actionview (4.2.5.2)
activesupport (= 4.2.5.2)
>>>>>>> upstream/master
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
active_model_serializers (0.8.1)
activemodel (>= 3.0)
<<<<<<< HEAD
activejob (4.2.5.1)
activesupport (= 4.2.5.1)
globalid (>= 0.3.0)
@ -41,6 +59,19 @@ GEM
activesupport (= 4.2.5.1)
arel (~> 6.0)
activesupport (4.2.5.1)
=======
activejob (4.2.5.2)
activesupport (= 4.2.5.2)
globalid (>= 0.3.0)
activemodel (4.2.5.2)
activesupport (= 4.2.5.2)
builder (~> 3.1)
activerecord (4.2.5.2)
activemodel (= 4.2.5.2)
activesupport (= 4.2.5.2)
arel (~> 6.0)
activesupport (4.2.5.2)
>>>>>>> upstream/master
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -131,8 +162,6 @@ GEM
term-ansicolor
thor
currencies (0.4.2)
d3_rails (3.4.6)
railties (>= 3.1.0)
daemons (1.1.9)
database_cleaner (1.3.0)
debug_inspector (0.0.2)
@ -166,10 +195,10 @@ GEM
font-awesome-rails (4.1.0.0)
railties (>= 3.2, < 5.0)
formatador (0.2.4)
formtastic (2.3.0.rc3)
actionpack (>= 3.0)
formtastic-bootstrap (3.0.0)
formtastic (>= 2.2)
formtastic (3.1.3)
actionpack (>= 3.2.13)
formtastic-bootstrap (3.1.1)
formtastic (>= 3.0)
geocoder (1.2.2)
globalid (0.3.6)
activesupport (>= 4.1.0)
@ -223,7 +252,7 @@ GEM
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.99)
mime-types (2.99.1)
mimemagic (0.3.0)
mina (0.3.8)
open4 (~> 1.3.4)
@ -318,6 +347,7 @@ GEM
ruby-openid (>= 2.1.8)
rack-test (0.6.3)
rack (>= 1.0)
<<<<<<< HEAD
rails (4.2.5.1)
actionmailer (= 4.2.5.1)
actionpack (= 4.2.5.1)
@ -328,6 +358,18 @@ GEM
activesupport (= 4.2.5.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5.1)
=======
rails (4.2.5.2)
actionmailer (= 4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
activemodel (= 4.2.5.2)
activerecord (= 4.2.5.2)
activesupport (= 4.2.5.2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5.2)
>>>>>>> upstream/master
sprockets-rails
rails-assets-date.format (1.2.3)
rails-assets-holderjs (2.9.1)
@ -351,9 +393,15 @@ GEM
loofah (~> 2.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
<<<<<<< HEAD
railties (4.2.5.1)
actionpack (= 4.2.5.1)
activesupport (= 4.2.5.1)
=======
railties (4.2.5.2)
actionpack (= 4.2.5.2)
activesupport (= 4.2.5.2)
>>>>>>> upstream/master
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
@ -496,7 +544,6 @@ DEPENDENCIES
cocoon
country_select!
coveralls
d3_rails
daemons
database_cleaner
delayed_job_active_record
@ -504,7 +551,7 @@ DEPENDENCIES
devise_ichain_authenticatable
factory_girl_rails
font-awesome-rails
formtastic (~> 2.3.0.rc3)
formtastic (~> 3.1.1)
formtastic-bootstrap
gravtastic
guard-rspec (~> 4.2.8)