Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

Commit

Permalink
packaging: Updated patch
Browse files Browse the repository at this point in the history
Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
  • Loading branch information
mssola committed Aug 8, 2017
1 parent 19d0986 commit 5789776
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions packaging/suse/patches/0_change_versions.gem.patch
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
diff --git a/Gemfile b/Gemfile
index 5a5b38d20e7e..309f537a8fa2 100644
index c381ef85d581..3ce7b07db103 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ def packaging?
end

# If the deployment is done through Puma, include it in the bundle.
-gem "puma", "~> 3.7.0" if ENV["PORTUS_PUMA_DEPLOYMENT"] == "yes" || !packaging?
+gem "puma", "~> 2.16.0" if ENV["PORTUS_PUMA_DEPLOYMENT"] == "yes" || !packaging?

# In order to create the Gemfile.lock required for packaging
# meaning that it should contain only the production packages
@@ -68,6 +68,7 @@ unless packaging?
# Configuration management
gem "cconfig", "~> 1.1.0"
@@ -71,6 +71,7 @@ unless packaging?
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
@@ -84,7 +85,6 @@ unless packaging?
@@ -87,7 +88,6 @@ unless packaging?
gem "factory_girl_rails"
gem "ffaker"
gem "rubocop", "~> 0.41.2", require: false
Expand All @@ -28,10 +28,10 @@ index 5a5b38d20e7e..309f537a8fa2 100644
gem "md2man", "~>5.1.1", require: false
gem "binman", "~>5.1.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 329a6d22d549..d584cc4a122f 100644
index 1002b93fbe80..51a627efb99c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -127,7 +127,7 @@ GEM
@@ -129,7 +129,7 @@ GEM
octokit (~> 2.0.0)
yajl-ruby
gli (2.8.1)
Expand All @@ -40,7 +40,7 @@ index 329a6d22d549..d584cc4a122f 100644
activesupport (>= 4.1.0)
gravatar_image_tag (1.2.0)
guard (2.13.0)
@@ -180,15 +180,15 @@ GEM
@@ -182,15 +182,15 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
Expand All @@ -61,7 +61,7 @@ index 329a6d22d549..d584cc4a122f 100644
notiffany (0.0.8)
nenv (~> 0.1)
shellany (~> 0.0)
@@ -216,7 +216,7 @@ GEM
@@ -218,7 +218,7 @@ GEM
activerecord (>= 3.0)
i18n (>= 0.5.0)
railties (>= 3.0.0)
Expand All @@ -70,7 +70,7 @@ index 329a6d22d549..d584cc4a122f 100644
pundit (1.0.1)
activesupport (>= 3.0.0)
quiet_assets (1.1.0)
@@ -239,7 +239,7 @@ GEM
@@ -241,7 +241,7 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
Expand All @@ -79,7 +79,7 @@ index 329a6d22d549..d584cc4a122f 100644
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
@@ -257,11 +257,11 @@ GEM
@@ -259,11 +259,11 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
Expand All @@ -93,7 +93,7 @@ index 329a6d22d549..d584cc4a122f 100644
responders (2.1.0)
railties (>= 4.2.0, < 5)
rouge (1.11.1)
@@ -329,18 +329,18 @@ GEM
@@ -331,18 +331,18 @@ GEM
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
Expand All @@ -115,7 +115,7 @@ index 329a6d22d549..d584cc4a122f 100644
thread_safe (0.3.5)
tilt (1.4.1)
timecop (0.7.4)
@@ -419,7 +419,7 @@ DEPENDENCIES
@@ -422,7 +422,7 @@ DEPENDENCIES
poltergeist (~> 1.15.0)
pry-rails
public_activity
Expand Down

0 comments on commit 5789776

Please sign in to comment.