Skip to content
Open
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
45 changes: 23 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ GEM
bourbon (4.2.7)
sass (~> 3.4)
thor (~> 0.19)
builder (3.2.2)
builder (3.2.4)
byebug (9.0.4)
camertron-eprun (1.1.0)
cancancan (1.10.1)
Expand All @@ -93,6 +93,7 @@ GEM
coffee-script-source (1.10.0)
colorize (0.7.7)
concurrent-ruby (1.0.2)
crass (1.0.6)
css_parser (1.4.1)
addressable
datetime_picker_rails (0.0.7)
Expand Down Expand Up @@ -129,8 +130,8 @@ GEM
globalid (0.3.6)
activesupport (>= 4.1.0)
highline (1.6.21)
hoe (3.15.0)
rake (>= 0.8, < 12.0)
hoe (3.22.1)
rake (>= 0.8, < 15.0)
htmlentities (4.3.4)
httparty (0.13.7)
json (~> 1.8)
Expand All @@ -145,23 +146,24 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.3)
json_pure (1.8.3)
json (1.8.6)
json_pure (2.2.0)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
lingq (0.3.1)
bundler
httparty
loofah (2.0.3)
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.0.0)
minitest (5.9.0)
mini_portile2 (2.1.0)
minitest (5.14.0)
momentjs-rails (2.11.1)
railties (>= 3.1)
monetize (1.4.0)
Expand All @@ -174,8 +176,8 @@ GEM
neat (1.7.4)
bourbon (>= 4.0)
sass (>= 3.3)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
normalize-rails (3.0.3)
orm_adapter (0.5.0)
paperclip (4.2.4)
Expand All @@ -197,7 +199,7 @@ GEM
puma (3.4.0)
rabl (0.11.8)
activesupport (>= 2.3.14)
rack (1.6.4)
rack (1.6.13)
rack-ssl (1.0.0)
rack
rack-test (0.6.3)
Expand All @@ -215,26 +217,25 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
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.3)
loofah (~> 2.0)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (4.2.5)
actionpack (= 4.2.5)
activesupport (= 4.2.5)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.1.2)
rake (13.0.1)
ransack (1.4.1)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
i18n
polyamorous (~> 1.1)
rdoc (4.2.2)
json (~> 1.4)
rdoc (6.2.1)
responders (2.2.0)
railties (>= 4.2.0, < 5.1)
rubyforge (2.0.4)
Expand Down Expand Up @@ -323,8 +324,8 @@ GEM
activerecord (>= 4.1, < 5.1)
state_machines-activemodel (>= 0.3.0)
stringex (2.6.0)
thor (0.19.1)
thread_safe (0.3.5)
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
truncate_html (0.9.2)
turbolinks (2.5.3)
Expand All @@ -334,7 +335,7 @@ GEM
cldr-plurals-runtime-rb (~> 1.0.0)
json
tzinfo
tzinfo (1.2.2)
tzinfo (1.2.6)
thread_safe (~> 0.1)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
Expand Down