diff --git a/Gemfile b/Gemfile index 6dec9e9a..0263c176 100644 --- a/Gemfile +++ b/Gemfile @@ -5,8 +5,7 @@ gem 'rails', '4.2.2' gem 'rails-i18n' gem 'i18n-js' -gem 'pg', group: :postgres -gem 'mysql2', group: :mysql +gem 'pg' gem 'sass-rails', '~> 4.0.3' gem 'uglifier', '>= 1.3.0' @@ -78,7 +77,7 @@ group :development do gem 'spring', '~> 1.3.5' # ten thousand raises no more! gem 'byebug' - gem 'web-console' + gem 'web-console', '< 3.0.0' end group :production do diff --git a/Gemfile.lock b/Gemfile.lock index 1cb68be5..ae8e575d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/retrospring/questiongenerator.git - revision: 902de3d7f930a4f67bbbbc414cc3556cc7114839 + revision: c5f8362ff769425d42a94b3a611731eadaa5e0ca specs: questiongenerator (0.1.0) @@ -8,7 +8,7 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - CFPropertyList (2.3.1) + CFPropertyList (2.3.2) actionmailer (4.2.2) actionpack (= 4.2.2) actionview (= 4.2.2) @@ -44,7 +44,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) + addressable (2.4.0) arel (6.0.3) bcrypt (3.1.10) better_errors (2.1.1) @@ -58,69 +58,69 @@ GEM bootstrap3-datetimepicker-rails (4.7.14) momentjs-rails (>= 2.8.1) bootstrap_form (2.3.0) - bootswatch-rails (3.2.4) + bootswatch-rails (3.3.5) railties (>= 3.1) - brakeman (3.1.0) + brakeman (3.1.4) erubis (~> 2.6) fastercsv (~> 1.5) haml (>= 3.0, < 5.0) - highline (~> 1.6) + highline (>= 1.6.20, < 2.0) multi_json (~> 1.2) ruby2ruby (>= 2.1.1, < 2.3.0) ruby_parser (~> 3.7.0) + safe_yaml (>= 1.0) sass (~> 3.0) slim (>= 1.3.6, < 4.0) - terminal-table (~> 1.4.5) + terminal-table (~> 1.4) buftok (0.2.0) builder (3.2.2) - byebug (4.0.5) - columnize (= 0.9.0) - capybara (2.4.4) + byebug (8.2.1) + capybara (2.5.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - celluloid (0.16.0) - timers (~> 4.0.0) climate_control (0.0.3) activesupport (>= 3.0) cliver (0.3.2) - cocaine (0.5.7) + cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.0) - coffee-rails (4.1.0) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0, < 5.1.x) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) - columnize (0.9.0) + coffee-script-source (1.10.0) + concurrent-ruby (1.0.0) connection_pool (2.2.0) crass (1.0.2) - daemons (1.2.2) - database_cleaner (1.4.1) + daemons (1.2.3) + database_cleaner (1.5.1) debug_inspector (0.0.2) delayed_paperclip (2.9.1) paperclip (>= 3.3) - devise (3.4.1) + devise (3.5.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) responders thread_safe (~> 0.1) warden (~> 1.2.3) - devise-async (0.9.0) + devise-async (0.10.1) devise (~> 3.2) - devise-i18n (0.12.0) + devise-i18n (0.12.1) diff-lcs (1.2.5) docile (1.1.5) - equalizer (0.0.11) + domain_name (0.5.25) + unf (>= 0.0.5, < 1.0.0) + equalizer (0.0.10) erubis (2.7.0) - eventmachine (1.0.7) - excon (0.45.1) - execjs (2.5.2) + eventmachine (1.0.8) + excon (0.45.4) + execjs (2.6.0) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.5.0) @@ -129,23 +129,28 @@ GEM fake_email_validator (1.0.11) activemodel mail - faker (1.4.3) + faker (1.6.1) i18n (~> 0.5) - faraday (0.9.1) + faraday (0.9.2) multipart-post (>= 1.2, < 3) - faraday_middleware (0.9.1) + faraday_middleware (0.9.2) faraday (>= 0.7.4, < 0.10) fastercsv (1.5.5) ffi (1.9.10) fission (0.5.0) CFPropertyList (~> 2.2) - fog (1.28.0) + fog (1.37.0) + fog-aliyun (>= 0.1.0) fog-atmos - fog-aws (~> 0.0) + fog-aws (>= 0.6.0) fog-brightbox (~> 0.4) - fog-core (~> 1.27, >= 1.27.3) - fog-ecloud + fog-core (~> 1.32) + fog-dynect (~> 0.0.2) + fog-ecloud (~> 0.1) + fog-google (<= 0.1.0) fog-json + fog-local + fog-powerdns (>= 0.1.1) fog-profitbricks fog-radosgw (>= 0.0.2) fog-riakcs @@ -156,38 +161,56 @@ GEM fog-terremark fog-vmfusion fog-voxel + fog-vsphere (>= 0.4.0) + fog-xenserver fog-xml (~> 0.1.1) ipaddress (~> 0.5) - nokogiri (~> 1.5, >= 1.5.11) + fog-aliyun (0.1.0) + fog-core (~> 1.27) + fog-json (~> 1.0) + ipaddress (~> 0.8) + xml-simple (~> 1.1) fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.1.1) + fog-aws (0.8.0) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-brightbox (0.7.1) + fog-brightbox (0.10.1) fog-core (~> 1.22) fog-json inflecto (~> 0.0.2) - fog-core (1.29.0) + fog-core (1.35.0) builder - excon (~> 0.38) + excon (~> 0.45) formatador (~> 0.2) - mime-types - net-scp (~> 1.1) - net-ssh (>= 2.1.3) - fog-ecloud (0.0.2) + fog-dynect (0.0.2) + fog-core + fog-json + fog-xml + fog-ecloud (0.3.0) fog-core fog-xml - fog-json (1.0.0) - multi_json (~> 1.0) - fog-profitbricks (0.0.2) + fog-google (0.1.0) + fog-core + fog-json + fog-xml + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-local (0.2.1) + fog-core (~> 1.27) + fog-powerdns (0.1.1) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + fog-profitbricks (0.0.5) fog-core fog-xml nokogiri - fog-radosgw (0.0.3) + fog-radosgw (0.0.4) fog-core (>= 1.21.0) fog-json fog-xml (>= 0.0.1) @@ -195,33 +218,39 @@ GEM fog-core fog-json fog-xml - fog-sakuracloud (1.0.0) + fog-sakuracloud (1.7.5) fog-core fog-json - fog-serverlove (0.1.1) + fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (0.4.1) + fog-softlayer (1.0.2) fog-core fog-json - fog-storm_on_demand (0.1.0) + fog-storm_on_demand (0.1.1) fog-core fog-json - fog-terremark (0.0.4) + fog-terremark (0.1.0) fog-core fog-xml - fog-vmfusion (0.0.1) + fog-vmfusion (0.1.0) fission fog-core - fog-voxel (0.0.2) + fog-voxel (0.1.0) fog-core fog-xml - fog-xml (0.1.1) + fog-vsphere (0.4.0) + fog-core + rbvmomi (~> 1.8) + fog-xenserver (0.2.2) + fog-core + fog-xml + fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) font-awesome-rails (4.3.0.0) railties (>= 3.2, < 5.0) - font-kit-rails (1.1.0) + font-kit-rails (1.2.0) rails foreman (0.78.0) thor (~> 0.19.1) @@ -240,104 +269,108 @@ GEM guard-brakeman (0.8.3) brakeman (>= 2.1.1) guard (>= 2.0.0) - haml (4.0.6) + haml (4.0.7) tilt - hashie (3.4.1) - highline (1.7.3) + hashie (3.4.3) + highline (1.7.8) hike (1.2.3) - hitimes (1.2.2) - http (0.6.4) + http (0.9.8) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 1.0.1) http_parser.rb (~> 0.6.0) + http-cookie (1.0.2) + domain_name (~> 0.5) + http-form_data (1.0.1) http_parser.rb (0.6.0) i18n (0.7.0) - i18n-js (3.0.0.rc10) - i18n (~> 0.6) + i18n-js (2.1.2) + i18n inflecto (0.0.2) - ipaddress (0.8.0) - jbuilder (2.2.13) + ipaddress (0.8.2) + jbuilder (2.2.16) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-minicolors-rails (2.1.4.0) jquery-rails rails (>= 3.2.8) - jquery-rails (4.0.3) + jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks - jquery-ui-rails (5.0.3) + jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.9.3) + kgio (2.10.0) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.4.1) launchy (~> 2.2) - listen (3.0.3) + listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) loofah (2.0.3) nokogiri (>= 1.5.9) - lumberjack (1.0.9) + lumberjack (1.0.10) mail (2.6.3) mime-types (>= 1.16, < 3) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.8.2) - mime-types (2.6.1) - mini_portile (0.6.2) - minitest (5.8.0) - momentjs-rails (2.9.0) + mime-types (2.99) + mimemagic (0.3.0) + mini_portile2 (2.0.0) + minitest (5.8.3) + momentjs-rails (2.10.6) railties (>= 3.1) multi_json (1.11.2) multipart-post (2.0.0) - mysql2 (0.3.18) - naught (1.0.0) + naught (1.1.0) nenv (0.2.0) nested_form (0.3.2) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (2.9.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - nokogumbo (1.2.0) + nokogiri (1.6.7.1) + mini_portile2 (~> 2.0.0.rc2) + nokogumbo (1.4.7) nokogiri - notiffany (0.0.7) + notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) - nprogress-rails (0.1.6.6) + nprogress-rails (0.1.6.7) oauth (0.4.7) - omniauth (1.2.2) + omniauth (1.3.1) hashie (>= 1.2, < 4) - rack (~> 1.0) - omniauth-oauth (1.0.1) + rack (>= 1.0, < 3) + omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-tumblr (1.1) - omniauth-oauth (~> 1.0) - omniauth-twitter (1.1.0) - multi_json (~> 1.3) + omniauth-tumblr (1.2) + multi_json omniauth-oauth (~> 1.0) + omniauth-twitter (1.2.1) + json (~> 1.3) + omniauth-oauth (~> 1.1) orm_adapter (0.5.0) - paperclip (4.2.1) - activemodel (>= 3.0.0) - activesupport (>= 3.0.0) - cocaine (~> 0.5.3) + paperclip (4.3.2) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) mime-types - pg (0.18.1) - pghero (1.1.1) + mimemagic (= 0.3.0) + pg (0.18.4) + pghero (1.2.0) activerecord - poltergeist (1.6.0) + poltergeist (1.8.1) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - pry (0.10.1) + pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) @@ -360,9 +393,9 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.2) sprockets-rails - rails-assets-growl (1.2.5) + rails-assets-growl (1.3.1) rails-assets-jquery - rails-assets-jquery (2.1.3) + rails-assets-jquery (2.1.4) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.7) @@ -371,10 +404,10 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.2) loofah (~> 2.0) - rails-i18n (4.0.4) - i18n (~> 0.6) + rails-i18n (4.0.8) + i18n (~> 0.7) railties (~> 4.0) - rails_admin (0.6.7) + rails_admin (0.8.1) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) @@ -393,22 +426,24 @@ GEM activesupport (= 4.2.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.13.0) + raindrops (0.15.0) rake (10.4.2) - rb-fsevent (0.9.5) + rb-fsevent (0.9.7) rb-inotify (0.9.5) ffi (>= 0.5.0) - rdoc (4.2.0) + rbvmomi (1.8.2) + builder + nokogiri (>= 1.4.1) + trollop + rdoc (4.2.1) json (~> 1.4) - redcarpet (3.2.3) - redis (3.2.1) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) + redcarpet (3.3.4) + redis (3.2.2) remotipart (1.2.1) - responders (2.1.0) - railties (>= 4.2.0, < 5) - rollbar (1.5.3) - multi_json (~> 1.3) + responders (2.1.1) + railties (>= 4.2.0, < 5.1) + rollbar (2.7.1) + multi_json rspec-core (3.0.4) rspec-support (~> 3.0.0) rspec-expectations (3.0.4) @@ -429,13 +464,13 @@ GEM ruby2ruby (2.2.0) ruby_parser (~> 3.1) sexp_processor (~> 4.0) - ruby_parser (3.7.1) + ruby_parser (3.7.2) sexp_processor (~> 4.1) safe_yaml (1.0.4) - sanitize (3.1.2) - crass (~> 1.0.1) + sanitize (4.0.1) + crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (= 1.2.0) + nokogumbo (~> 1.4.1) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) @@ -447,14 +482,13 @@ GEM rdoc (~> 4.0) sexp_processor (4.6.0) shellany (0.0.1) - sidekiq (3.3.3) - celluloid (>= 0.16.0) - connection_pool (>= 2.1.1) - json - redis (>= 3.0.6) - redis-namespace (>= 1.3.1) + sidekiq (4.0.1) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.2, >= 2.2.0) + json (~> 1.0) + redis (~> 3.2, >= 3.2.1) simple_oauth (0.3.1) - simplecov (0.10.0) + simplecov (0.11.1) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) @@ -472,31 +506,30 @@ GEM temple (~> 0.7.3) tilt (>= 1.3.3, < 2.1) slop (3.6.0) - spring (1.3.5) + spring (1.3.6) sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.2) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) sweetalert-rails (0.5.0) railties (>= 3.1.0) temple (0.7.6) - terminal-table (1.4.5) - thin (1.6.3) + terminal-table (1.5.2) + thin (1.6.4) daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0) + eventmachine (~> 1.0, >= 1.0.4) rack (~> 1.0) thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - timers (4.0.1) - hitimes tiny-color-rails (0.0.2) railties (>= 3.0) + trollop (2.1.2) tumblr_client (0.8.5) faraday (~> 0.9.0) faraday_middleware (~> 0.9.0) @@ -508,12 +541,12 @@ GEM coffee-rails twemoji-rails (1.2.1.3) railties (>= 3.0.0) - twitter (5.14.0) + twitter (5.15.0) addressable (~> 2.3) buftok (~> 0.2.0) - equalizer (~> 0.0.9) + equalizer (= 0.0.10) faraday (~> 0.9.0) - http (~> 0.6.0) + http (>= 0.4, < 0.10) http_parser.rb (~> 0.6.0) json (~> 1.8) memoizable (~> 0.4.0) @@ -521,26 +554,30 @@ GEM simple_oauth (~> 0.3.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.1) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - unicorn (4.8.3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.1) + unicorn (5.0.1) kgio (~> 2.6) rack raindrops (~> 0.7) - warden (1.2.3) + warden (1.2.4) rack (>= 1.0) - web-console (2.1.2) + web-console (2.2.1) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - websocket-driver (0.5.4) + websocket-driver (0.6.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - will_paginate (3.0.7) + will_paginate (3.1.0) will_paginate-bootstrap (1.0.1) will_paginate (>= 3.0.3) + xml-simple (1.1.5) xpath (2.0.0) nokogiri (~> 1.3) @@ -580,7 +617,6 @@ DEPENDENCIES jquery-turbolinks letter_opener momentjs-rails (>= 2.9.0) - mysql2 nprogress-rails omniauth omniauth-tumblr @@ -618,7 +654,7 @@ DEPENDENCIES twitter uglifier (>= 1.3.0) unicorn - web-console + web-console (< 3.0.0) will_paginate will_paginate-bootstrap diff --git a/README.md b/README.md index 5308b80b..af4f2f0a 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ ## THIS REPO ISN'T ACTIVELY MAINTAINED ANYMORE! ALL FURTHER DEVELOPMENT HAPPENS AT [Retrospring/next](http://github.com/retrospring/next)! +(the previous statement was a lie, lol) + This is the source code that powers Retrospring. This is a detached fork of [nilsding/justask](https://github.com/nilsding/justask), where we continue development.