Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP4:Update
portus.3372
downgrade_rails.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File downgrade_rails.patch of Package portus.3372
commit 266a12a22f39b8abcf55d56011de2ab7c0bfa045 Author: Jordi Massaguer Pla <jmassaguerpla@suse.de> Date: Wed Dec 7 22:04:36 2016 +0100 Revert "brakeman: upgrade gems so there are no more securty issues" This reverts commit 1491d584dc01ee6336cc52356af5d18d4ff972a8. diff --git a/.travis.yml b/.travis.yml index 72bf838..745a75c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,6 @@ script: - bundle exec rspec spec packaging/suse/portusctl/spec - bundle exec rubocop -V - bundle exec rubocop -F - - bundle exec brakeman -z -A -x CheckUnscopedFind,CheckRender - env: global: # OSC_CREDENTIALS are kept secret diff --git a/Gemfile b/Gemfile index 9e97848..e552376 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "~> 4.2.6" +gem "rails", "~> 4.2.2" gem "jquery-rails" gem "sass-rails", ">= 3.2" gem "slim" @@ -59,6 +59,7 @@ end # PACKAGING=yes bundle list unless ENV["PACKAGING"] && ENV["PACKAGING"] == "yes" + group :development do gem "annotate" gem "rails-erd" @@ -66,6 +67,7 @@ unless ENV["PACKAGING"] && ENV["PACKAGING"] == "yes" gem "pry-rails" gem "git-review", require: false gem "rack-mini-profiler", require: false + gem "brakeman", require: false gem "guard", require: false gem "guard-rubocop", require: false gem "guard-rspec", require: false @@ -82,7 +84,6 @@ unless ENV["PACKAGING"] && ENV["PACKAGING"] == "yes" gem "factory_girl_rails" gem "ffaker" gem "rubocop", "~> 0.41.2", require: false - gem "brakeman", require: false gem "database_cleaner" gem "md2man", "~>5.1.1", require: false gem "binman", "~>5.1.0" @@ -101,4 +102,5 @@ unless ENV["PACKAGING"] && ENV["PACKAGING"] == "yes" gem "codeclimate-test-reporter", group: :test, require: nil gem "docker-api", "~> 1.28.0" end + end diff --git a/Gemfile.lock b/Gemfile.lock index f7e6cab..2ba2627 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,40 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + actionmailer (4.2.2) + actionpack (= 4.2.2) + actionview (= 4.2.2) + activejob (= 4.2.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) + actionpack (4.2.2) + actionview (= 4.2.2) + activesupport (= 4.2.2) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + actionview (4.2.2) + activesupport (= 4.2.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) + rails-html-sanitizer (~> 1.0, >= 1.0.1) active_model_serializers (0.9.0) activemodel (>= 3.2) active_record_union (1.1.0) activerecord (>= 4.0) - activejob (4.2.6) - activesupport (= 4.2.6) + activejob (4.2.2) + activesupport (= 4.2.2) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.2) + activesupport (= 4.2.2) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.2) + activemodel (= 4.2.2) + activesupport (= 4.2.2) arel (~> 6.0) - activesupport (4.2.6) + activesupport (4.2.2) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -44,7 +44,7 @@ GEM annotate (2.6.5) activerecord (>= 2.3.0) rake (>= 0.8.7) - arel (6.0.3) + arel (6.0.0) ast (2.3.0) autoprefixer-rails (5.2.0.1) execjs @@ -136,7 +136,7 @@ GEM octokit (~> 2.0.0) yajl-ruby gli (2.8.1) - globalid (0.3.6) + globalid (0.3.5) activesupport (>= 4.1.0) gravatar_image_tag (1.2.0) guard (2.13.0) @@ -181,28 +181,27 @@ GEM listen (3.0.6) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9.7) - loofah (2.0.3) + loofah (2.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.10) - mail (2.6.4) - mime-types (>= 1.16, < 4) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) md2man (5.1.1) binman (~> 5.0) redcarpet (~> 3.0) rouge (~> 1.0) method_source (0.8.2) - mime-types (3.0) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0221) - mini_portile2 (2.0.0) - minitest (5.8.4) - multi_json (1.11.2) + mime-types (1.25) + mini_portile (0.5.2) + minitest (5.7.0) + multi_json (1.8.2) multipart-post (2.0.0) mysql2 (0.3.18) nenv (0.3.0) net-ldap (0.11) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.1) + mini_portile (~> 0.5.0) notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) @@ -218,7 +217,7 @@ GEM cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyglot (0.3.5) + polyglot (0.3.3) powerpack (0.1.1) pry (0.10.1) coderay (~> 1.1.0) @@ -239,22 +238,22 @@ GEM rack (1.6.4) rack-mini-profiler (0.9.3) rack (>= 1.1.3) - rack-test (0.6.3) + rack-test (0.6.2) rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + rails (4.2.2) + actionmailer (= 4.2.2) + actionpack (= 4.2.2) + actionview (= 4.2.2) + activejob (= 4.2.2) + activemodel (= 4.2.2) + activerecord (= 4.2.2) + activesupport (= 4.2.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) + railties (= 4.2.2) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) + rails-dom-testing (1.0.6) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) @@ -263,16 +262,16 @@ GEM activesupport (>= 3.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) - rails-html-sanitizer (1.0.3) + rails-html-sanitizer (1.0.2) loofah (~> 2.0) rails_stdout_logging (0.0.5) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (4.2.2) + actionpack (= 4.2.2) + activesupport (= 4.2.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - rake (11.1.2) + rake (10.3.2) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) @@ -344,23 +343,24 @@ GEM temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) slop (3.6.0) - sprockets (2.12.4) + sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.3) + sprockets-rails (2.3.1) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) temple (0.6.7) terminal-table (1.5.2) - thor (0.19.1) + thor (0.18.1) thread_safe (0.3.5) tilt (1.4.1) timecop (0.7.4) - treetop (1.6.5) - polyglot (~> 0.3) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) turbolinks (2.5.3) coffee-rails typhoeus (1.0.2) @@ -440,7 +440,7 @@ DEPENDENCIES pundit quiet_assets rack-mini-profiler - rails (~> 4.2.6) + rails (~> 4.2.2) rails-erd rails_stdout_logging (~> 0.0.5) redcarpet diff --git a/spec/controllers/admin/activities_controller_spec.rb b/spec/controllers/admin/activities_controller_spec.rb index e771a72..4f20460 100644 --- a/spec/controllers/admin/activities_controller_spec.rb +++ b/spec/controllers/admin/activities_controller_spec.rb @@ -93,7 +93,7 @@ RSpec.describe Admin::ActivitiesController, type: :controller do it "generates a csv file" do get :index, format: :csv - expect(response.headers).to include( + expect(response.headers).to match( "Content-Disposition" => 'attachment; filename="activities.csv"', "Content-Type" => "text/csv" )
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
