Merge branch 'fix-bundler-platforms' of https://github.com/knu/huginn into knu-fix-bundler-platforms

Andrew Cantino 10 gadi atpakaļ
vecāks
revīzija
44bb36f058
2 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 5 2
      Gemfile
  2. 1 0
      Gemfile.lock

+ 5 - 2
Gemfile

@@ -1,16 +1,19 @@
1 1
 source 'https://rubygems.org'
2 2
 
3
+# bundler <1.5 does not recognize :x64_mingw as a valid platform name
4
+gem 'bundler', '>= 1.5.0'
5
+
3 6
 gem 'protected_attributes', '~>1.0.7'
4 7
 
5 8
 gem 'rails', '4.1.0'
6 9
 
7 10
 case RUBY_PLATFORM
8
-when /freebsd/i
11
+when /freebsd/
9 12
   # Seems FreeBSD's zoneinfo is not exactly what tzinfo expects
10 13
   gem 'tzinfo-data'
11 14
 else
12 15
   # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
13
-  gem 'tzinfo-data', platforms: [:mswin]
16
+  gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
14 17
 end
15 18
 
16 19
 gem 'mysql2', '~> 0.3.15'

+ 1 - 0
Gemfile.lock

@@ -315,6 +315,7 @@ DEPENDENCIES
315 315
   better_errors
316 316
   binding_of_caller
317 317
   bootstrap-kaminari-views (~> 0.0.2)
318
+  bundler (>= 1.5.0)
318 319
   coffee-rails (~> 4.0.0)
319 320
   coveralls
320 321
   daemons (~> 1.1.9)