Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ gem 'sinatra', require: nil
gem 'sidekiq', require: 'sidekiq/web'
# gem 'sidetiq', require: 'sidetiq/web'
gem 'sidetiq', require: 'sidetiq/web', group: :production
gem 'rails_admin', '0.6.6'
gem 'rails_admin', '1.4.3'
gem 'ruby-ntlm', require: 'ntlm/smtp'
gem 'heroku-api'
gem 'rest-client'
Expand Down
83 changes: 42 additions & 41 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ GEM
parallel
alertify-rails (0.2.0)
anbt-sql-formatter (0.0.2)
arel (6.0.3)
arel (6.0.4)
awesome_print (1.6.1)
bcrypt (3.1.10)
better_errors (2.1.1)
Expand All @@ -78,7 +78,7 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
builder (3.2.4)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
Expand Down Expand Up @@ -108,7 +108,7 @@ GEM
railties (>= 4.0.0, < 5.0)
coffee-react (2.4.1)
execjs
coffee-script (2.3.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.8.0)
Expand All @@ -129,6 +129,7 @@ GEM
compass (~> 1.0.0)
sass-rails (<= 5.0.1)
sprockets (< 2.13)
concurrent-ruby (1.1.8)
connection_pool (2.1.1)
crass (1.0.1)
ctags-bundler (0.0.1)
Expand Down Expand Up @@ -170,7 +171,7 @@ GEM
erubis (2.7.0)
eventmachine (1.0.7)
excon (0.44.4)
execjs (2.3.0)
execjs (2.7.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
Expand Down Expand Up @@ -284,16 +285,16 @@ GEM
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
font-awesome-rails (4.3.0.0)
railties (>= 3.2, < 5.0)
font-awesome-rails (4.7.0.7)
railties (>= 3.2, < 7)
font-awesome-sass (4.3.1)
sass (~> 3.2)
formatador (0.2.5)
friendly_id (5.1.0)
activerecord (>= 4.0.0)
git-version (0.0.3)
globalid (0.3.6)
activesupport (>= 4.1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
grit (2.0.0)
diff-lcs (>= 1.1.2)
mime-types (>= 1.15)
Expand All @@ -319,7 +320,7 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
haml (4.0.6)
haml (4.0.7)
tilt
hashdiff (0.2.2)
hashie (3.4.0)
Expand All @@ -331,7 +332,8 @@ GEM
http-cookie (1.0.2)
domain_name (~> 0.5)
http_parser.rb (0.6.0)
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
ice_cube (0.11.1)
inflecto (0.0.2)
interception (0.5)
Expand All @@ -347,7 +349,7 @@ GEM
railties (>= 3.2.16)
js-model-rails (0.0.4)
railties (>= 3.0)
json (1.8.3)
json (1.8.6)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -360,8 +362,8 @@ GEM
loofah (2.0.3)
nokogiri (>= 1.5.9)
lumberjack (1.0.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mail (2.7.1)
mini_mime (>= 0.1.1)
markdown-rails (0.2.1)
rails
rdiscount (>= 1.6.8, < 2.0)
Expand All @@ -379,11 +381,12 @@ GEM
method_source (0.8.2)
migration_data (0.0.4)
rails (>= 4.0.0.rc1)
mime-types (2.99)
mime-types (2.99.3)
mini_magick (4.0.4)
mini_mime (1.1.0)
mini_portile2 (2.0.0)
minitest (5.8.3)
multi_json (1.11.2)
minitest (5.14.4)
multi_json (1.15.0)
multi_xml (0.5.5)
multipart-post (2.0.0)
nenv (0.2.0)
Expand Down Expand Up @@ -452,14 +455,14 @@ GEM
respond_to_missing
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.4)
rack (1.6.13)
rack-contrib (1.2.0)
rack (>= 0.9.1)
rack-livereload (0.3.15)
rack
rack-pjax (0.8.0)
rack-pjax (1.1.0)
nokogiri (~> 1.5)
rack (~> 1.1)
rack (>= 1.1)
rack-protection (1.5.3)
rack
rack-test (0.6.3)
Expand All @@ -475,33 +478,32 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
rails-deprecated_sanitizer (1.0.4)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-i18n (4.0.5)
i18n (~> 0.6)
railties (~> 4.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_admin (0.6.6)
rails_admin (1.4.3)
builder (~> 3.1)
coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0, < 5)
haml (~> 4.0)
haml (>= 4.0, < 6)
jquery-rails (>= 3.0, < 5)
jquery-ui-rails (~> 5.0)
kaminari (~> 0.14)
jquery-ui-rails (>= 5.0, < 7)
kaminari (>= 0.14, < 2.0)
nested_form (~> 0.3)
rack-pjax (~> 0.7)
rails (~> 4.0)
remotipart (~> 1.0)
safe_yaml (~> 1.0)
rack-pjax (>= 0.7)
rails (>= 4.0, < 6)
remotipart (~> 1.3)
sass-rails (>= 4.0, < 6)
rails_admin-i18n (0.0.9)
rails_serve_static_assets (0.0.4)
Expand All @@ -511,7 +513,7 @@ GEM
activesupport (= 4.2.5)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rake (13.0.3)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
Expand All @@ -524,7 +526,7 @@ GEM
redis (>= 3.0.0)
redis-namespace (1.5.1)
redis (~> 3.0, >= 3.0.4)
remotipart (1.2.1)
remotipart (1.4.4)
request_store (1.1.0)
respond_to_missing (0.0.1)
responders (2.1.0)
Expand Down Expand Up @@ -558,12 +560,11 @@ GEM
rubyzip (1.1.7)
russian (0.6.0)
i18n (>= 0.5.0)
safe_yaml (1.0.4)
sanitize (3.1.1)
crass (~> 1.0.1)
nokogiri (>= 1.4.4)
nokogumbo (= 1.2.0)
sass (3.4.20)
sass (3.4.25)
sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
Expand Down Expand Up @@ -620,7 +621,7 @@ GEM
spring (1.3.6)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (2.12.4)
sprockets (2.12.5)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -639,15 +640,15 @@ GEM
syntax (1.2.0)
table_print (1.5.3)
temple (0.7.5)
thor (0.19.1)
thread_safe (0.3.5)
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
timecop (0.7.1)
timers (4.0.1)
hitimes
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (2.7.0)
execjs (>= 0.3.0)
Expand Down Expand Up @@ -745,7 +746,7 @@ DEPENDENCIES
rails (= 4.2.5)
rails-i18n
rails_12factor
rails_admin (= 0.6.6)
rails_admin (= 1.4.3)
rails_admin-i18n
react-rails (~> 1.0.0.pre)!
redis-cache
Expand Down