Skip to content

[Snyk] Security upgrade merb from 1.1.0 to 1.1.1 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samawad wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Snyk] Security upgrade merb from 1.1.0 to 1.1.1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ group :development, :test, :rails3 do
gem "ruby-debug"
gem "rspec"
gem "rack-cache"
gem "merb", "1.1.0"
gem "merb", "1.1.1"
gem "i18n"
gem "methopara" if RUBY_VERSION.match /1\.9/
end
Expand Down
194 changes: 108 additions & 86 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,32 @@
GEM
remote: http://rubygems.org/
specs:
ParseTree (3.0.5)
RubyInline (>= 3.7.0)
sexp_processor (>= 3.0.0)
RubyInline (3.8.4)
ZenTest
ZenTest (4.3.3)
abstract (1.0.0)
ParseTree (3.0.9)
RubyInline (~> 3.9.0)
sexp_processor (~> 3.2.0)
RubyInline (3.9.0)
ZenTest (~> 4.3)
ZenTest (4.12.2)
actionpack (2.3.8)
activesupport (= 2.3.8)
rack (~> 1.1.0)
activesupport (2.3.8)
addressable (2.1.2)
bcrypt-ruby (2.1.2)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
bcrypt-ruby (2.1.4)
columnize (0.3.1)
data_objects (0.10.2)
data_mapper (0.10.2)
dm-aggregates (~> 0.10.2)
dm-constraints (~> 0.10.2)
dm-core (~> 0.10.2)
dm-migrations (~> 0.10.2)
dm-serializer (~> 0.10.2)
dm-timestamps (~> 0.10.2)
dm-types (~> 0.10.2)
dm-validations (~> 0.10.2)
data_objects (0.10.17)
addressable (~> 2.1)
diff-lcs (1.1.2)
diff-lcs (1.6.0)
dm-aggregates (0.10.2)
dm-core (~> 0.10.2)
dm-constraints (0.10.2)
Expand All @@ -31,9 +40,6 @@ GEM
dm-core (~> 0.10.2)
fastercsv (~> 1.5.0)
json_pure (~> 1.2.0)
dm-sweatshop (0.10.2)
dm-core (~> 0.10.2)
randexp (~> 0.1.4)
dm-timestamps (0.10.2)
dm-core (~> 0.10.2)
dm-types (0.10.2)
Expand All @@ -45,58 +51,55 @@ GEM
uuidtools (~> 2.1.1)
dm-validations (0.10.2)
dm-core (~> 0.10.2)
do_sqlite3 (0.10.2)
data_objects (= 0.10.2)
erubis (2.6.6)
abstract (>= 1.0.0)
extlib (0.9.15)
fastercsv (1.5.3)
do_sqlite3 (0.10.17)
data_objects (= 0.10.17)
erubis (2.7.0)
extlib (0.9.16)
fastercsv (1.5.5)
gemcutter (0.6.1)
git (1.2.5)
haml (3.0.15)
highline (1.6.1)
haml (6.3.0)
temple (>= 0.8.2)
thor
tilt
highline (2.1.0)
i18n (0.4.1)
jeweler (1.4.0)
gemcutter (>= 0.1.0)
git (>= 1.2.5)
rubyforge (>= 2.0.0)
json_pure (1.2.4)
linecache (0.43)
logger (1.6.6)
mailfactory (1.4.0)
mime-types (>= 1.13.1)
merb (1.1.0)
dm-aggregates (~> 0.10)
dm-constraints (~> 0.10)
dm-serializer (~> 0.10)
dm-sweatshop (~> 0.10)
dm-timestamps (~> 0.10)
dm-types (~> 0.10)
dm-validations (~> 0.10)
do_sqlite3 (~> 0.10)
merb-action-args (= 1.1.0)
merb-assets (= 1.1.0)
merb-auth (= 1.1.0)
merb-cache (= 1.1.0)
merb-core (= 1.1.0)
merb-exceptions (= 1.1.0)
merb-gen (= 1.1.0)
merb-haml (= 1.1.0)
merb-helpers (= 1.1.0)
merb-mailer (= 1.1.0)
merb-param-protection (= 1.1.0)
merb-slices (= 1.1.0)
merb_datamapper (= 1.1.0)
merb-action-args (1.1.0)
merb (1.1.1)
data_mapper (>= 0.10.0)
do_sqlite3 (>= 0.10.0)
merb-action-args (= 1.1.1)
merb-assets (= 1.1.1)
merb-auth (= 1.1.1)
merb-cache (= 1.1.1)
merb-exceptions (= 1.1.1)
merb-gen (= 1.1.1)
merb-haml (= 1.1.1)
merb-helpers (= 1.1.1)
merb-mailer (= 1.1.1)
merb-param-protection (= 1.1.1)
merb-slices (= 1.1.1)
merb_datamapper (= 1.1.1)
rspec
merb-action-args (1.1.1)
ParseTree (>= 2.1.1)
merb-core (~> 1.1.0)
merb-core (~> 1.1.1)
ruby2ruby (>= 1.1.9)
merb-assets (1.1.0)
merb-core (~> 1.1.0)
merb-auth (1.1.0)
merb-auth-core (~> 1.1.0)
merb-auth-more (~> 1.1.0)
merb-auth-slice-password (~> 1.1.0)
merb-core (~> 1.1.0)
merb-assets (1.1.1)
merb-core (~> 1.1.1)
merb-auth (1.1.1)
merb-auth-core (~> 1.1.1)
merb-auth-more (~> 1.1.1)
merb-auth-slice-password (~> 1.1.1)
merb-core (~> 1.1)
merb-auth-core (1.1.1)
merb-core (~> 1.1)
merb-auth-more (1.1.1)
Expand All @@ -105,66 +108,82 @@ GEM
merb-auth-core (~> 1.1.1)
merb-auth-more (~> 1.1.1)
merb-slices (~> 1.1)
merb-cache (1.1.0)
merb-core (~> 1.1.0)
merb-core (1.1.0)
bundler (>= 0.9.3)
merb-cache (1.1.1)
merb-core (~> 1.1.1)
merb-core (1.1.3)
bundler
erubis (>= 2.6.2)
extlib (>= 0.9.13)
mime-types (>= 1.16)
rack
rake
rspec
merb-exceptions (1.1.0)
merb-core (~> 1.1.0)
merb-mailer (~> 1.1.0)
merb-gen (1.1.0)
merb-core (~> 1.1.0)
merb-exceptions (1.1.1)
merb-core (~> 1.1.1)
merb-mailer (~> 1.1.1)
merb-gen (1.1.1)
merb-core (~> 1.1.1)
templater (>= 1.0.0)
merb-haml (1.1.0)
merb-haml (1.1.1)
haml (>= 2.0.3)
merb-core (~> 1.1.0)
merb-helpers (1.1.0)
merb-core (~> 1.1.0)
merb-mailer (1.1.0)
merb-core (~> 1.1.1)
merb-helpers (1.1.1)
merb-core (~> 1.1.1)
merb-mailer (1.1.1)
mailfactory (>= 1.2.3)
merb-core (~> 1.1.0)
merb-param-protection (1.1.0)
merb-core (~> 1.1.0)
merb-slices (1.1.0)
merb-core (~> 1.1.0)
merb_datamapper (1.1.0)
merb-core (~> 1.1.1)
merb-param-protection (1.1.1)
merb-core (~> 1.1.1)
merb-slices (1.1.1)
merb-core (~> 1.1.1)
merb_datamapper (1.1.1)
dm-core (~> 0.10)
dm-migrations (~> 0.10)
merb-core (~> 1.1.0)
mime-types (1.16)
rack (1.1.0)
merb-core (~> 1.1)
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2025.0204)
public_suffix (5.1.1)
rack (1.1.6)
rack-cache (0.5.2)
rack (>= 0.4)
rake (0.8.7)
randexp (0.1.5)
ParseTree
rake (13.2.1)
redis (2.0.5)
rspec (1.3.0)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.3)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.2)
ruby-debug (0.10.3)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.3.0)
ruby-debug-base (0.10.3)
linecache (>= 0.3)
ruby2ruby (1.2.4)
ruby2ruby (1.3.1)
ruby_parser (~> 2.0)
sexp_processor (~> 3.0)
ruby_parser (2.0.4)
ruby_parser (2.3.1)
sexp_processor (~> 3.0)
rubyforge (2.0.4)
json_pure (>= 1.1.7)
sexp_processor (3.0.4)
sexp_processor (3.2.0)
stringex (1.1.0)
templater (1.0.0)
diff-lcs (>= 1.1.2)
extlib (>= 0.9.5)
highline (>= 1.4.0)
uuidtools (2.1.1)
temple (0.10.3)
thor (1.3.2)
tilt (2.6.0)
uuidtools (2.1.5)

PLATFORMS
ruby
Expand All @@ -175,9 +194,12 @@ DEPENDENCIES
git
i18n
jeweler
merb (= 1.1.0)
merb (= 1.1.1)
rack
rack-cache
redis (>= 2.0.0)
rspec
ruby-debug

BUNDLED WITH
2.1.4