summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-10-01 01:21:42 +0200
committerVarac <varac@leap.se>2017-10-16 13:20:41 +0200
commit009594945171ce5aab15d341f36fad80dce36377 (patch)
treed92e77e395947c18ae65cdfb52241f41d4d5cd99
parentd38ffd2864575cecb193c9933e0c6a40cbbaf6c3 (diff)
pin two other gems that fail to install otherwise
-rw-r--r--.gitignore2
-rw-r--r--Gemfile6
-rw-r--r--Gemfile.lock12
3 files changed, 14 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 65268e8..bc62fd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ history.yml
.*.swp
assets/images/piwik.png
credentials
+.bundle/
+vendor/
diff --git a/Gemfile b/Gemfile
index 439b890..08e8f3f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,12 @@ source 'https://rubygems.org'
gem 'gitlab', :git => 'https://github.com/varac/gitlab.git', :branch => 'pipeline_support'
# activesupport >= 5.0.0 requires ruby 2.2 which break jessie support
gem 'activesupport', '< 5.0.0'
+# both following gems will break on jessie with
+# Gem::InstallError: rest-client requires Ruby version >= 2.0.0.
+# even when ruby 2.1 ist installed. So we pin earlier versions:
+gem 'mime-types', '2.6.2'
+gem 'rest-client', '< 2.0.0'
+
gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index 3615536..f541e3d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,9 +59,7 @@ GEM
i18n (0.7.0)
json (1.8.3)
metaclass (0.0.4)
- mime-types (3.1)
- mime-types-data (~> 3.2015)
- mime-types-data (3.2016.0521)
+ mime-types (2.6.2)
mini_portile2 (2.1.0)
minitest (5.2.3)
mocha (0.14.0)
@@ -87,10 +85,10 @@ GEM
rack-test (0.6.3)
rack (>= 1.0)
rake (10.1.1)
- rest-client (2.0.0)
+ rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
- mime-types (>= 1.16, < 4.0)
- netrc (~> 0.8)
+ mime-types (>= 1.16, < 3.0)
+ netrc (~> 0.7)
rufus-scheduler (2.0.24)
tzinfo (>= 0.3.22)
safe_yaml (1.0.4)
@@ -141,9 +139,11 @@ DEPENDENCIES
fakeweb (~> 1.3.0)
gitlab!
haml (~> 4.0.4)
+ mime-types (= 2.6.2)
minitest (~> 5.2.0)
mocha (~> 0.14.0)
rake (~> 10.1.0)
+ rest-client (< 2.0.0)
simplecov (~> 0.8.2)
BUNDLED WITH