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
48 changes: 24 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/openpprn/forem.git
revision: 38460fd370d3222ad77c5a72e5ca3597a2d5345e
remote: https://github.com/openpprn/forem.git
revision: 5ebf0859f21b13a7381e6448b34c7c783773df21
branch: rails-4.2
specs:
forem (1.0.0.beta1)
Expand Down Expand Up @@ -60,7 +60,7 @@ GEM
rake (>= 0.8.7)
autoprefixer-rails (4.0.1.1)
execjs
bcrypt (3.1.9)
bcrypt (3.1.18)
better_errors (2.0.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
Expand All @@ -71,13 +71,13 @@ GEM
railties (>= 3.1.0)
bootstrap-sass (3.3.1.0)
sass (~> 3.2)
builder (3.2.2)
builder (3.2.4)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
slop (~> 3.6)
callsite (0.0.11)
cancancan (1.9.2)
cancancan (1.17.0)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -100,17 +100,17 @@ GEM
execjs
coffee-script-source (1.8.0)
columnize (0.8.9)
concurrent-ruby (1.2.0)
daemons (1.1.9)
debug_inspector (0.0.2)
debugger-linecache (1.2.0)
decorators (1.0.3)
railties (>= 3.0.19, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.10, != 3.2.1, != 3.2.0, != 3.1.9, != 3.1.8, != 3.1.7, != 3.1.6, != 3.1.5, != 3.1.4, != 3.1.3, != 3.1.2, != 3.1.1, != 3.1.0)
devise (3.4.1)
decorators (1.0.5)
railties (>= 3.0.19)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
railties (>= 4.1.0)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
docile (1.1.5)
erubis (2.7.0)
Expand All @@ -123,22 +123,23 @@ GEM
ffi (1.9.6)
figaro (1.0.0)
thor (~> 0.14)
friendly_id (5.0.4)
friendly_id (5.0.5)
activerecord (>= 4.0.0)
gemoji (2.1.0)
geocoder (1.2.6)
haml (4.0.6)
tilt
hashie (2.0.5)
hike (1.2.3)
i18n (0.6.11)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jbuilder (2.2.5)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
json (1.8.6)
kaminari (0.16.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -157,7 +158,7 @@ GEM
mime-types (2.4.3)
mini_magick (4.0.1)
mini_portile (0.6.1)
minitest (5.4.3)
minitest (5.17.0)
minitest-capybara (0.7.1)
capybara (~> 2.2)
minitest (~> 5.0)
Expand All @@ -183,10 +184,10 @@ GEM
mini_portile (~> 0.6.0)
orm_adapter (0.5.0)
pg (0.17.1)
rack (1.5.2)
rack (1.5.5)
rack-contrib (1.2.0)
rack (>= 0.9.1)
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.7)
actionmailer (= 4.1.7)
Expand All @@ -208,7 +209,7 @@ GEM
activesupport (= 4.1.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rake (13.0.6)
rdoc (4.1.2)
json (~> 1.4)
redcarpet (3.2.1)
Expand All @@ -228,14 +229,13 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
select2-rails (3.5.9.1)
thor (~> 0.14)
select2-rails (3.5.11)
selenium-webdriver (2.44.0)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
simple_form (3.0.3)
simple_form (3.0.4)
actionpack (~> 4.0)
activemodel (~> 4.0)
simplecov (0.9.1)
Expand All @@ -258,12 +258,12 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0)
rack (~> 1.0)
thor (0.19.1)
thread_safe (0.3.4)
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
turbolinks (2.5.2)
coffee-rails
tzinfo (1.2.2)
tzinfo (1.2.10)
thread_safe (~> 0.1)
uglifier (2.5.3)
execjs (>= 0.3.0)
Expand All @@ -273,7 +273,7 @@ GEM
faraday_middleware (~> 0.9.0)
hashie (~> 2.0.3)
multi_json
warden (1.2.3)
warden (1.2.7)
rack (>= 1.0)
websocket (1.2.1)
workflow (1.0.0)
Expand Down