Updated again, pls work
This commit is contained in:
redfast00
parent
3d28785e3a
commit
98eb53863e
2 changed files with 109 additions and 124 deletions
2
Gemfile
2
Gemfile
|
|
@ -23,7 +23,7 @@ group :doc do
|
||||||
end
|
end
|
||||||
|
|
||||||
group :production do
|
group :production do
|
||||||
gem 'mysql2', '< 0.6.0', '>= 0.4.4' # Database
|
gem 'mysql2' # Database
|
||||||
end
|
end
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
|
|
||||||
231
Gemfile.lock
231
Gemfile.lock
|
|
@ -35,92 +35,82 @@ GEM
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.3, >= 0.3.4)
|
thread_safe (~> 0.3, >= 0.3.4)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
addressable (2.4.0)
|
addressable (2.5.2)
|
||||||
airbrake (4.3.5)
|
public_suffix (>= 2.0.2, < 4.0)
|
||||||
|
airbrake (4.3.8)
|
||||||
builder
|
builder
|
||||||
multi_json
|
multi_json
|
||||||
annotate (2.7.0)
|
airbrussh (1.3.0)
|
||||||
|
sshkit (>= 1.6.1, != 1.7.0)
|
||||||
|
annotate (2.7.4)
|
||||||
activerecord (>= 3.2, < 6.0)
|
activerecord (>= 3.2, < 6.0)
|
||||||
rake (~> 10.4)
|
rake (>= 10.4, < 13.0)
|
||||||
arel (6.0.4)
|
arel (6.0.4)
|
||||||
bcrypt (3.1.10)
|
bcrypt (3.1.12)
|
||||||
bootstrap-sass (3.2.0.0)
|
bootstrap-sass (3.2.0.0)
|
||||||
sass (~> 3.2)
|
sass (~> 3.2)
|
||||||
bootstrap-switch-rails (3.3.3)
|
bootstrap-switch-rails (3.3.4)
|
||||||
bootstrap-will_paginate (0.0.10)
|
bootstrap-will_paginate (0.0.10)
|
||||||
will_paginate
|
will_paginate
|
||||||
builder (3.2.3)
|
builder (3.2.3)
|
||||||
cancancan (1.13.1)
|
cancancan (2.2.0)
|
||||||
capistrano (3.4.0)
|
capistrano (3.11.0)
|
||||||
|
airbrussh (>= 1.0.0)
|
||||||
i18n
|
i18n
|
||||||
rake (>= 10.0.0)
|
rake (>= 10.0.0)
|
||||||
sshkit (~> 1.3)
|
sshkit (>= 1.9.0)
|
||||||
capistrano-bundler (1.1.4)
|
capistrano-bundler (1.3.0)
|
||||||
capistrano (~> 3.1)
|
capistrano (~> 3.1)
|
||||||
sshkit (~> 1.2)
|
sshkit (~> 1.2)
|
||||||
capistrano-passenger (0.2.0)
|
capistrano-passenger (0.2.0)
|
||||||
capistrano (~> 3.0)
|
capistrano (~> 3.0)
|
||||||
capistrano-rails (1.1.6)
|
capistrano-rails (1.4.0)
|
||||||
capistrano (~> 3.1)
|
capistrano (~> 3.1)
|
||||||
capistrano-bundler (~> 1.1)
|
capistrano-bundler (~> 1.1)
|
||||||
capistrano-rbenv (2.0.4)
|
capistrano-rbenv (2.1.3)
|
||||||
capistrano (~> 3.1)
|
capistrano (~> 3.1)
|
||||||
sshkit (~> 1.3)
|
sshkit (~> 1.3)
|
||||||
capistrano-rvm (0.1.2)
|
capistrano-rvm (0.1.2)
|
||||||
capistrano (~> 3.0)
|
capistrano (~> 3.0)
|
||||||
sshkit (~> 1.2)
|
sshkit (~> 1.2)
|
||||||
chunky_png (1.3.5)
|
chunky_png (1.3.10)
|
||||||
climate_control (0.0.3)
|
climate_control (0.2.0)
|
||||||
activesupport (>= 3.0)
|
codeclimate-test-reporter (1.0.8)
|
||||||
cocaine (0.5.8)
|
simplecov (<= 0.13)
|
||||||
climate_control (>= 0.0.3, < 1.0)
|
|
||||||
codeclimate-test-reporter (0.4.8)
|
|
||||||
simplecov (>= 0.7.1, < 1.0.0)
|
|
||||||
coffee-rails (4.1.1)
|
|
||||||
coffee-script (>= 2.2.0)
|
|
||||||
railties (>= 4.0.0, < 5.1.x)
|
|
||||||
coffee-script (2.4.1)
|
|
||||||
coffee-script-source
|
|
||||||
execjs
|
|
||||||
coffee-script-source (1.10.0)
|
|
||||||
concurrent-ruby (1.0.5)
|
concurrent-ruby (1.0.5)
|
||||||
coveralls (0.8.10)
|
coveralls (0.8.19)
|
||||||
json (~> 1.8)
|
json (>= 1.8, < 3)
|
||||||
rest-client (>= 1.6.8, < 2)
|
simplecov (~> 0.12.0)
|
||||||
simplecov (~> 0.11.0)
|
|
||||||
term-ansicolor (~> 1.3)
|
term-ansicolor (~> 1.3)
|
||||||
thor (~> 0.19.1)
|
thor (~> 0.19.1)
|
||||||
tins (~> 1.6.0)
|
tins (~> 1.6)
|
||||||
crack (0.4.3)
|
crack (0.4.3)
|
||||||
safe_yaml (~> 1.0.0)
|
safe_yaml (~> 1.0.0)
|
||||||
crass (1.0.4)
|
crass (1.0.4)
|
||||||
daemons (1.2.3)
|
daemons (1.2.6)
|
||||||
delayed_job (4.1.4)
|
delayed_job (4.1.4)
|
||||||
activesupport (>= 3.0, < 5.2)
|
activesupport (>= 3.0, < 5.2)
|
||||||
delayed_job_active_record (4.1.0)
|
delayed_job_active_record (4.1.3)
|
||||||
activerecord (>= 3.0, < 5)
|
activerecord (>= 3.0, < 5.3)
|
||||||
delayed_job (>= 3.0, < 5)
|
delayed_job (>= 3.0, < 5)
|
||||||
devise (3.5.6)
|
devise (4.4.3)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
railties (>= 3.2.6, < 5)
|
railties (>= 4.1.0, < 6.0)
|
||||||
responders
|
responders
|
||||||
thread_safe (~> 0.1)
|
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.3)
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
domain_name (0.5.20160128)
|
|
||||||
unf (>= 0.0.5, < 1.0.0)
|
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (2.6.0)
|
execjs (2.7.0)
|
||||||
factory_girl (4.5.0)
|
factory_girl (4.9.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
factory_girl_rails (4.6.0)
|
factory_girl_rails (4.9.0)
|
||||||
factory_girl (~> 4.5.0)
|
factory_girl (~> 4.9.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
faker (1.4.2)
|
faker (1.4.2)
|
||||||
i18n (~> 0.5)
|
i18n (~> 0.5)
|
||||||
faraday (0.9.2)
|
faraday (0.12.2)
|
||||||
multipart-post (>= 1.2, < 3)
|
multipart-post (>= 1.2, < 3)
|
||||||
friendly_id (5.1.0)
|
friendly_id (5.1.0)
|
||||||
activerecord (>= 4.0.0)
|
activerecord (>= 4.0.0)
|
||||||
|
|
@ -134,68 +124,67 @@ GEM
|
||||||
haml (>= 4.0.6, < 5.0)
|
haml (>= 4.0.6, < 5.0)
|
||||||
html2haml (>= 1.0.1)
|
html2haml (>= 1.0.1)
|
||||||
railties (>= 4.0.1)
|
railties (>= 4.0.1)
|
||||||
hashdiff (0.2.3)
|
hashdiff (0.3.7)
|
||||||
hashie (3.4.3)
|
hashie (3.5.7)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
html2haml (2.0.0)
|
html2haml (2.2.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
haml (~> 4.0.0)
|
haml (>= 4.0, < 6)
|
||||||
nokogiri (~> 1.6.0)
|
nokogiri (>= 1.6.0)
|
||||||
ruby_parser (~> 3.5)
|
ruby_parser (~> 3.5)
|
||||||
http-cookie (1.0.2)
|
httparty (0.16.2)
|
||||||
domain_name (~> 0.5)
|
|
||||||
httparty (0.13.7)
|
|
||||||
json (~> 1.8)
|
|
||||||
multi_xml (>= 0.5.2)
|
multi_xml (>= 0.5.2)
|
||||||
i18n (0.9.5)
|
i18n (0.9.5)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
identicon (0.0.5)
|
identicon (0.0.5)
|
||||||
chunky_png
|
chunky_png
|
||||||
jquery-rails (4.1.0)
|
jquery-rails (4.3.3)
|
||||||
rails-dom-testing (~> 1.0)
|
rails-dom-testing (>= 1, < 3)
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (1.8.6)
|
json (1.8.6)
|
||||||
jwt (1.5.1)
|
jwt (1.5.6)
|
||||||
loofah (2.2.2)
|
loofah (2.2.2)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
mail (2.7.0)
|
mail (2.7.0)
|
||||||
mini_mime (>= 0.1.1)
|
mini_mime (>= 0.1.1)
|
||||||
mime-types (2.99.3)
|
mime-types (3.1)
|
||||||
mimemagic (0.3.0)
|
mime-types-data (~> 3.2015)
|
||||||
|
mime-types-data (3.2016.0521)
|
||||||
|
mimemagic (0.3.2)
|
||||||
mini_mime (1.0.0)
|
mini_mime (1.0.0)
|
||||||
mini_portile2 (2.1.0)
|
mini_portile2 (2.3.0)
|
||||||
minitest (5.11.3)
|
minitest (5.11.3)
|
||||||
multi_json (1.13.1)
|
multi_json (1.13.1)
|
||||||
multi_xml (0.5.5)
|
multi_xml (0.6.0)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
mysql2 (0.5.2)
|
mysql2 (0.5.2)
|
||||||
net-scp (1.2.1)
|
net-scp (1.2.1)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (3.0.2)
|
net-ssh (5.0.2)
|
||||||
netrc (0.11.0)
|
nokogiri (1.8.4)
|
||||||
nokogiri (1.6.8.1)
|
mini_portile2 (~> 2.3.0)
|
||||||
mini_portile2 (~> 2.1.0)
|
oauth2 (1.4.0)
|
||||||
oauth2 (1.1.0)
|
faraday (>= 0.8, < 0.13)
|
||||||
faraday (>= 0.8, < 0.10)
|
jwt (~> 1.0)
|
||||||
jwt (~> 1.0, < 1.5.2)
|
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
multi_xml (~> 0.5)
|
multi_xml (~> 0.5)
|
||||||
rack (>= 1.2, < 3)
|
rack (>= 1.2, < 3)
|
||||||
omniauth (1.3.1)
|
omniauth (1.8.1)
|
||||||
hashie (>= 1.2, < 4)
|
hashie (>= 3.4.6, < 3.6.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.6.2, < 3)
|
||||||
omniauth-oauth2 (1.3.1)
|
omniauth-oauth2 (1.3.1)
|
||||||
oauth2 (~> 1.0)
|
oauth2 (~> 1.0)
|
||||||
omniauth (~> 1.2)
|
omniauth (~> 1.2)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
paperclip (4.3.4)
|
paperclip (6.0.0)
|
||||||
activemodel (>= 3.2.0)
|
activemodel (>= 4.2.0)
|
||||||
activesupport (>= 3.2.0)
|
activesupport (>= 4.2.0)
|
||||||
cocaine (~> 0.5.5)
|
|
||||||
mime-types
|
mime-types
|
||||||
mimemagic (= 0.3.0)
|
mimemagic (~> 0.3.0)
|
||||||
|
terrapin (~> 0.6.0)
|
||||||
|
public_suffix (3.0.2)
|
||||||
rack (1.6.10)
|
rack (1.6.10)
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
|
|
@ -223,34 +212,30 @@ GEM
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.10)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (10.5.0)
|
rake (12.3.1)
|
||||||
rdoc (4.2.1)
|
rdoc (4.3.0)
|
||||||
json (~> 1.4)
|
responders (2.4.0)
|
||||||
responders (2.1.1)
|
actionpack (>= 4.2.0, < 5.3)
|
||||||
railties (>= 4.2.0, < 5.1)
|
railties (>= 4.2.0, < 5.3)
|
||||||
rest-client (1.8.0)
|
rspec-core (3.7.1)
|
||||||
http-cookie (>= 1.0.2, < 2.0)
|
rspec-support (~> 3.7.0)
|
||||||
mime-types (>= 1.16, < 3.0)
|
rspec-expectations (3.7.0)
|
||||||
netrc (~> 0.7)
|
|
||||||
rspec-core (3.4.2)
|
|
||||||
rspec-support (~> 3.4.0)
|
|
||||||
rspec-expectations (3.4.0)
|
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (~> 3.7.0)
|
||||||
rspec-mocks (3.4.1)
|
rspec-mocks (3.7.0)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (~> 3.7.0)
|
||||||
rspec-rails (3.4.2)
|
rspec-rails (3.7.2)
|
||||||
actionpack (>= 3.0, < 4.3)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0, < 4.3)
|
activesupport (>= 3.0)
|
||||||
railties (>= 3.0, < 4.3)
|
railties (>= 3.0)
|
||||||
rspec-core (~> 3.4.0)
|
rspec-core (~> 3.7.0)
|
||||||
rspec-expectations (~> 3.4.0)
|
rspec-expectations (~> 3.7.0)
|
||||||
rspec-mocks (~> 3.4.0)
|
rspec-mocks (~> 3.7.0)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (~> 3.7.0)
|
||||||
rspec-support (3.4.1)
|
rspec-support (3.7.1)
|
||||||
ruby_parser (3.7.3)
|
ruby_parser (3.11.0)
|
||||||
sexp_processor (~> 4.1)
|
sexp_processor (~> 4.9)
|
||||||
safe_yaml (1.0.4)
|
safe_yaml (1.0.4)
|
||||||
sass (3.2.19)
|
sass (3.2.19)
|
||||||
sass-rails (4.0.5)
|
sass-rails (4.0.5)
|
||||||
|
|
@ -258,16 +243,17 @@ GEM
|
||||||
sass (~> 3.2.2)
|
sass (~> 3.2.2)
|
||||||
sprockets (~> 2.8, < 3.0)
|
sprockets (~> 2.8, < 3.0)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
sdoc (0.4.1)
|
sdoc (0.4.2)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
rdoc (~> 4.0)
|
rdoc (~> 4.0)
|
||||||
sexp_processor (4.6.1)
|
sexp_processor (4.11.0)
|
||||||
simplecov (0.11.2)
|
simplecov (0.12.0)
|
||||||
docile (~> 1.1.0)
|
docile (~> 1.1.0)
|
||||||
json (~> 1.8)
|
json (>= 1.8, < 3)
|
||||||
simplecov-html (~> 0.10.0)
|
simplecov-html (~> 0.10.0)
|
||||||
simplecov-html (0.10.0)
|
simplecov-html (0.10.2)
|
||||||
spring (1.6.2)
|
spring (2.0.2)
|
||||||
|
activesupport (>= 4.2)
|
||||||
sprockets (2.12.5)
|
sprockets (2.12.5)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
|
|
@ -277,29 +263,28 @@ GEM
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
sqlite3 (1.3.11)
|
sqlite3 (1.3.13)
|
||||||
sshkit (1.8.1)
|
sshkit (1.17.0)
|
||||||
net-scp (>= 1.1.2)
|
net-scp (>= 1.1.2)
|
||||||
net-ssh (>= 2.8.0)
|
net-ssh (>= 2.8.0)
|
||||||
term-ansicolor (1.3.2)
|
term-ansicolor (1.6.0)
|
||||||
tins (~> 1.0)
|
tins (~> 1.0)
|
||||||
|
terrapin (0.6.0)
|
||||||
|
climate_control (>= 0.0.3, < 1.0)
|
||||||
thor (0.19.4)
|
thor (0.19.4)
|
||||||
thread_safe (0.3.6)
|
thread_safe (0.3.6)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
tins (1.6.0)
|
tins (1.16.3)
|
||||||
turbolinks (2.5.3)
|
turbolinks (5.1.1)
|
||||||
coffee-rails
|
turbolinks-source (~> 5.1)
|
||||||
|
turbolinks-source (5.1.0)
|
||||||
tzinfo (1.2.5)
|
tzinfo (1.2.5)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.7.2)
|
uglifier (4.1.16)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0, < 3)
|
||||||
json (>= 1.8.0)
|
warden (1.2.7)
|
||||||
unf (0.1.4)
|
|
||||||
unf_ext
|
|
||||||
unf_ext (0.0.7.2)
|
|
||||||
warden (1.2.6)
|
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
webmock (1.22.6)
|
webmock (3.4.2)
|
||||||
addressable (>= 2.3.6)
|
addressable (>= 2.3.6)
|
||||||
crack (>= 0.3.2)
|
crack (>= 0.3.2)
|
||||||
hashdiff
|
hashdiff
|
||||||
|
|
@ -333,7 +318,7 @@ DEPENDENCIES
|
||||||
httparty
|
httparty
|
||||||
identicon
|
identicon
|
||||||
jquery-rails
|
jquery-rails
|
||||||
mysql2 (>= 0.4.4, < 0.6.0)
|
mysql2
|
||||||
omniauth-oauth2 (= 1.3.1)
|
omniauth-oauth2 (= 1.3.1)
|
||||||
paperclip
|
paperclip
|
||||||
rails (~> 4.2.8)
|
rails (~> 4.2.8)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue