Home Explore Help
Register Sign In
maarten
/
aardbei
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 243 Releases 0 Wiki
Browse Source

bundle update

Maarten van den Berg 6 years ago
parent
8756218372
commit
b80a76f77e
2 changed files with 127 additions and 111 deletions
Split View Show Diff Stats
  1. 13 7
      Gemfile
  2. 114 104
      Gemfile.lock

+ 13 - 7
Gemfile
View File 

@@ -1,30 +1,33 @@
1 1 
 source 'https://rubygems.org'
2 2
3 
-
4 3 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
5 4 
 gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
5 
+
6 6 
 # Use Puma as the app server
7 7 
 gem 'puma', '~> 3.0'
8 
+
8 9 
 # Use SCSS for stylesheets
9 10 
 gem 'sass-rails', '~> 5.0'
11 
+
10 12 
 # Use Uglifier as compressor for JavaScript assets, babel for ES6
11 13 
 gem 'babel-transpiler'
12 14 
 gem 'uglifier', '>= 1.3.0'
15 
+
13 16 
 # Use CoffeeScript for .coffee assets and views
14 17 
 gem 'coffee-rails', '~> 4.2'
15 
-# See https://github.com/rails/execjs#readme for more supported runtimes
16 
-# gem 'therubyracer', platforms: :ruby
17 18
18 19 
 # Use jquery as the JavaScript library
19 20 
 gem 'jquery-rails'
21 
+
20 22 
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
21 23 
 gem 'turbolinks', '~> 5'
24 
+
22 25 
 # Use ActiveModel has_secure_password
23 26 
 gem 'bcrypt', '~> 3.1.7'
24 27
25 28 
 # Use Bootstrap for CSS
26 
-gem 'bootstrap-sass', '~> 3.3.6'
27 29 
 gem 'autoprefixer-rails'
30 
+gem 'bootstrap-sass', '~> 3.3.6'
28 31
29 32 
 # In-place editing
30 33 
 gem 'x-editable-rails'
 
@@ -36,8 +39,8 @@ gem 'faker'
36 39 
 gem 'haml'
37 40
38 41 
 # Use RABL for JSON
39 
-gem 'rabl'
40 42 
 gem 'oj'
43 
+gem 'rabl'
41 44
42 45 
 # Clipping
43 46 
 gem 'clipboard-rails'
 
@@ -53,12 +56,14 @@ gem 'mailgun_rails'
53 56
54 57 
 # Pagination
55 58 
 gem 'will_paginate', '~> 3.1.0'
59 
+
60 
+# Bootstrap integration for will_paginate
56 61 
 gem 'bootstrap-will_paginate'
57 62
58 63 
 # Delayed jobs
64 
+gem 'daemons'
59 65 
 gem 'delayed_job'
60 66 
 gem 'delayed_job_active_record'
61 
-gem 'daemons'
62 67
63 68 
 # Error reporting
64 69 
 gem 'sentry-raven'
 
@@ -76,8 +81,9 @@ group :development do
76 81 
   gem 'sqlite3'
77 82
78 83 
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
79 
-  gem 'web-console'
80 84 
   gem 'listen', '~> 3.0.5'
85 
+  gem 'web-console'
86 
+
81 87 
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
82 88 
   gem 'spring'
83 89 
   gem 'spring-watcher-listen', '~> 2.0.0'

+ 114 - 104
Gemfile.lock
View File 

@@ -1,51 +1,51 @@
1 1 
 GEM
2 2 
   remote: https://rubygems.org/
3 3 
   specs:
4 
-    actioncable (5.0.2)
5 
-      actionpack (= 5.0.2)
4 
+    actioncable (5.0.7.1)
5 
+      actionpack (= 5.0.7.1)
6 6 
       nio4r (>= 1.2, < 3.0)
7 7 
       websocket-driver (~> 0.6.1)
8 
-    actionmailer (5.0.2)
9 
-      actionpack (= 5.0.2)
10 
-      actionview (= 5.0.2)
11 
-      activejob (= 5.0.2)
8 
+    actionmailer (5.0.7.1)
9 
+      actionpack (= 5.0.7.1)
10 
+      actionview (= 5.0.7.1)
11 
+      activejob (= 5.0.7.1)
12 12 
       mail (~> 2.5, >= 2.5.4)
13 13 
       rails-dom-testing (~> 2.0)
14 
-    actionpack (5.0.2)
15 
-      actionview (= 5.0.2)
16 
-      activesupport (= 5.0.2)
14 
+    actionpack (5.0.7.1)
15 
+      actionview (= 5.0.7.1)
16 
+      activesupport (= 5.0.7.1)
17 17 
       rack (~> 2.0)
18 18 
       rack-test (~> 0.6.3)
19 19 
       rails-dom-testing (~> 2.0)
20 20 
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
21 
-    actionview (5.0.2)
22 
-      activesupport (= 5.0.2)
21 
+    actionview (5.0.7.1)
22 
+      activesupport (= 5.0.7.1)
23 23 
       builder (~> 3.1)
24 24 
       erubis (~> 2.7.0)
25 25 
       rails-dom-testing (~> 2.0)
26 26 
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
27 
-    activejob (5.0.2)
28 
-      activesupport (= 5.0.2)
27 
+    activejob (5.0.7.1)
28 
+      activesupport (= 5.0.7.1)
29 29 
       globalid (>= 0.3.6)
30 
-    activemodel (5.0.2)
31 
-      activesupport (= 5.0.2)
32 
-    activerecord (5.0.2)
33 
-      activemodel (= 5.0.2)
34 
-      activesupport (= 5.0.2)
30 
+    activemodel (5.0.7.1)
31 
+      activesupport (= 5.0.7.1)
32 
+    activerecord (5.0.7.1)
33 
+      activemodel (= 5.0.7.1)
34 
+      activesupport (= 5.0.7.1)
35 35 
       arel (~> 7.0)
36 
-    activesupport (5.0.2)
36 
+    activesupport (5.0.7.1)
37 37 
       concurrent-ruby (~> 1.0, >= 1.0.2)
38 
-      i18n (~> 0.7)
38 
+      i18n (>= 0.7, < 2)
39 39 
       minitest (~> 5.1)
40 40 
       tzinfo (~> 1.1)
41 41 
     arel (7.1.4)
42 
-    autoprefixer-rails (6.7.7.2)
42 
+    autoprefixer-rails (9.4.3)
43 43 
       execjs
44 44 
     babel-source (5.8.35)
45 45 
     babel-transpiler (0.7.0)
46 46 
       babel-source (>= 4.0, < 6)
47 47 
       execjs (~> 2.0)
48 
-    bcrypt (3.1.11)
48 
+    bcrypt (3.1.12)
49 49 
     bindex (0.5.0)
50 50 
     bootstrap-sass (3.3.7)
51 51 
       autoprefixer-rails (>= 5.2.1)
 
@@ -53,161 +53,172 @@ GEM
53 53 
     bootstrap-will_paginate (1.0.0)
54 54 
       will_paginate
55 55 
     builder (3.2.3)
56 
-    byebug (9.0.6)
56 
+    byebug (10.0.2)
57 57 
     clipboard-rails (1.7.1)
58 
-    coffee-rails (4.2.1)
58 
+    coffee-rails (4.2.2)
59 59 
       coffee-script (>= 2.2.0)
60 
-      railties (>= 4.0.0, < 5.2.x)
60 
+      railties (>= 4.0.0)
61 61 
     coffee-script (2.4.1)
62 62 
       coffee-script-source
63 63 
       execjs
64 64 
     coffee-script-source (1.12.2)
65 
-    concurrent-ruby (1.0.5)
66 
-    daemons (1.2.4)
65 
+    concurrent-ruby (1.1.4)
66 
+    crass (1.0.4)
67 
+    daemons (1.3.1)
67 68 
     delayed_job (4.1.5)
68 69 
       activesupport (>= 3.0, < 5.3)
69 70 
     delayed_job_active_record (4.1.3)
70 71 
       activerecord (>= 3.0, < 5.3)
71 72 
       delayed_job (>= 3.0, < 5)
72 
-    domain_name (0.5.20170404)
73 
+    domain_name (0.5.20180417)
73 74 
       unf (>= 0.0.5, < 1.0.0)
74 75 
     erubis (2.7.0)
75 76 
     execjs (2.7.0)
76 
-    faker (1.7.3)
77 
-      i18n (~> 0.5)
78 
-    faraday (0.14.0)
77 
+    faker (1.9.1)
78 
+      i18n (>= 0.7)
79 
+    faraday (0.15.4)
79 80 
       multipart-post (>= 1.2, < 3)
80 
-    ffi (1.9.18)
81 
-    font-awesome-sass (4.7.0)
82 
-      sass (>= 3.2)
83 
-    globalid (0.4.0)
81 
+    ffi (1.9.25)
82 
+    font-awesome-sass (5.6.1)
83 
+      sassc (>= 1.11)
84 
+    globalid (0.4.1)
84 85 
       activesupport (>= 4.2.0)
85 
-    haml (4.0.7)
86 
+    haml (5.0.4)
87 
+      temple (>= 0.8.0)
86 88 
       tilt
87 89 
     http-cookie (1.0.3)
88 90 
       domain_name (~> 0.5)
89 
-    i18n (0.9.5)
91 
+    i18n (1.3.0)
90 92 
       concurrent-ruby (~> 1.0)
91 
-    i18n_generators (2.1.1)
92 
-      rails (>= 3.0.0)
93 
-    icalendar (2.4.1)
94 
-    jbuilder (2.6.3)
95 
-      activesupport (>= 3.0.0, < 5.2)
96 
-      multi_json (~> 1.2)
97 
-    jquery-rails (4.3.1)
93 
+    i18n_generators (2.2.0)
94 
+      activerecord (>= 3.0.0)
95 
+      railties (>= 3.0.0)
96 
+    icalendar (2.5.2)
97 
+      ice_cube (~> 0.16)
98 
+    ice_cube (0.16.3)
99 
+    jquery-rails (4.3.3)
98 100 
       rails-dom-testing (>= 1, < 3)
99 101 
       railties (>= 4.2.0)
100 102 
       thor (>= 0.14, < 2.0)
101 
-    json (2.0.4)
103 
+    json (2.1.0)
102 104 
     listen (3.0.8)
103 105 
       rb-fsevent (~> 0.9, >= 0.9.4)
104 106 
       rb-inotify (~> 0.9, >= 0.9.7)
105 
-    loofah (2.0.3)
107 
+    loofah (2.2.3)
108 
+      crass (~> 1.0.2)
106 109 
       nokogiri (>= 1.5.9)
107 
-    mail (2.6.4)
108 
-      mime-types (>= 1.16, < 4)
110 
+    mail (2.7.1)
111 
+      mini_mime (>= 0.1.1)
109 112 
     mailgun_rails (0.9.0)
110 113 
       actionmailer (>= 3.2.13)
111 114 
       json (>= 1.7.7)
112 115 
       rest-client (>= 1.6.7)
113 
-    method_source (0.8.2)
114 
-    mime-types (3.1)
116 
+    method_source (0.9.2)
117 
+    mime-types (3.2.2)
115 118 
       mime-types-data (~> 3.2015)
116 
-    mime-types-data (3.2016.0521)
117 
-    mini_portile2 (2.1.0)
119 
+    mime-types-data (3.2018.0812)
120 
+    mini_mime (1.0.1)
121 
+    mini_portile2 (2.4.0)
118 122 
     minitest (5.11.3)
119 
-    multi_json (1.12.1)
120 123 
     multipart-post (2.0.0)
121 124 
     netrc (0.11.0)
122 
-    nio4r (2.0.0)
123 
-    nokogiri (1.7.1)
124 
-      mini_portile2 (~> 2.1.0)
125 
-    oj (3.3.5)
126 
-    pg (0.20.0)
127 
-    puma (3.8.2)
128 
-    rabl (0.13.1)
125 
+    nio4r (2.3.1)
126 
+    nokogiri (1.9.1)
127 
+      mini_portile2 (~> 2.4.0)
128 
+    oj (3.7.4)
129 
+    pg (1.1.3)
130 
+    puma (3.12.0)
131 
+    rabl (0.14.0)
129 132 
       activesupport (>= 2.3.14)
130 
-    rack (2.0.1)
133 
+    rack (2.0.6)
131 134 
     rack-test (0.6.3)
132 135 
       rack (>= 1.0)
133 
-    rails (5.0.2)
134 
-      actioncable (= 5.0.2)
135 
-      actionmailer (= 5.0.2)
136 
-      actionpack (= 5.0.2)
137 
-      actionview (= 5.0.2)
138 
-      activejob (= 5.0.2)
139 
-      activemodel (= 5.0.2)
140 
-      activerecord (= 5.0.2)
141 
-      activesupport (= 5.0.2)
142 
-      bundler (>= 1.3.0, < 2.0)
143 
-      railties (= 5.0.2)
136 
+    rails (5.0.7.1)
137 
+      actioncable (= 5.0.7.1)
138 
+      actionmailer (= 5.0.7.1)
139 
+      actionpack (= 5.0.7.1)
140 
+      actionview (= 5.0.7.1)
141 
+      activejob (= 5.0.7.1)
142 
+      activemodel (= 5.0.7.1)
143 
+      activerecord (= 5.0.7.1)
144 
+      activesupport (= 5.0.7.1)
145 
+      bundler (>= 1.3.0)
146 
+      railties (= 5.0.7.1)
144 147 
       sprockets-rails (>= 2.0.0)
145 
-    rails-dom-testing (2.0.2)
146 
-      activesupport (>= 4.2.0, < 6.0)
147 
-      nokogiri (~> 1.6)
148 
-    rails-html-sanitizer (1.0.3)
149 
-      loofah (~> 2.0)
150 
-    railties (5.0.2)
151 
-      actionpack (= 5.0.2)
152 
-      activesupport (= 5.0.2)
148 
+    rails-dom-testing (2.0.3)
149 
+      activesupport (>= 4.2.0)
150 
+      nokogiri (>= 1.6)
151 
+    rails-html-sanitizer (1.0.4)
152 
+      loofah (~> 2.2, >= 2.2.2)
153 
+    railties (5.0.7.1)
154 
+      actionpack (= 5.0.7.1)
155 
+      activesupport (= 5.0.7.1)
153 156 
       method_source
154 157 
       rake (>= 0.8.7)
155 158 
       thor (>= 0.18.1, < 2.0)
156 
-    rake (12.0.0)
157 
-    rb-fsevent (0.9.8)
158 
-    rb-inotify (0.9.8)
159 
-      ffi (>= 0.5.0)
160 
-    rest-client (2.0.1)
159 
+    rake (12.3.2)
160 
+    rb-fsevent (0.10.3)
161 
+    rb-inotify (0.10.0)
162 
+      ffi (~> 1.0)
163 
+    rest-client (2.0.2)
161 164 
       http-cookie (>= 1.0.2, < 2.0)
162 165 
       mime-types (>= 1.16, < 4.0)
163 166 
       netrc (~> 0.8)
164 
-    sass (3.4.23)
165 
-    sass-rails (5.0.6)
167 
+    sass (3.7.2)
168 
+      sass-listen (~> 4.0.0)
169 
+    sass-listen (4.0.0)
170 
+      rb-fsevent (~> 0.9, >= 0.9.4)
171 
+      rb-inotify (~> 0.9, >= 0.9.7)
172 
+    sass-rails (5.0.7)
166 173 
       railties (>= 4.0.0, < 6)
167 174 
       sass (~> 3.1)
168 175 
       sprockets (>= 2.8, < 4.0)
169 176 
       sprockets-rails (>= 2.0, < 4.0)
170 177 
       tilt (>= 1.1, < 3)
171 
-    sentry-raven (2.7.2)
178 
+    sassc (2.0.0)
179 
+      ffi (~> 1.9.6)
180 
+      rake
181 
+    sentry-raven (2.7.4)
172 182 
       faraday (>= 0.7.6, < 1.0)
173 
-    spring (2.0.1)
183 
+    spring (2.0.2)
174 184 
       activesupport (>= 4.2)
175 185 
     spring-watcher-listen (2.0.1)
176 186 
       listen (>= 2.7, < 4.0)
177 187 
       spring (>= 1.2, < 3.0)
178 
-    sprockets (3.7.1)
188 
+    sprockets (3.7.2)
179 189 
       concurrent-ruby (~> 1.0)
180 190 
       rack (> 1, < 3)
181 
-    sprockets-rails (3.2.0)
191 
+    sprockets-rails (3.2.1)
182 192 
       actionpack (>= 4.0)
183 193 
       activesupport (>= 4.0)
184 194 
       sprockets (>= 3.0.0)
185 195 
     sqlite3 (1.3.13)
186 
-    thor (0.19.4)
196 
+    temple (0.8.0)
197 
+    thor (0.20.3)
187 198 
     thread_safe (0.3.6)
188 
-    tilt (2.0.7)
189 
-    turbolinks (5.0.1)
190 
-      turbolinks-source (~> 5)
191 
-    turbolinks-source (5.0.0)
199 
+    tilt (2.0.9)
200 
+    turbolinks (5.2.0)
201 
+      turbolinks-source (~> 5.2)
202 
+    turbolinks-source (5.2.0)
192 203 
     tzinfo (1.2.5)
193 204 
       thread_safe (~> 0.1)
194 
-    uglifier (3.2.0)
205 
+    uglifier (4.1.20)
195 206 
       execjs (>= 0.3.0, < 3)
196 207 
     unf (0.1.4)
197 208 
       unf_ext
198 
-    unf_ext (0.0.7.3)
199 
-    web-console (3.5.0)
209 
+    unf_ext (0.0.7.5)
210 
+    web-console (3.7.0)
200 211 
       actionview (>= 5.0)
201 212 
       activemodel (>= 5.0)
202 213 
       bindex (>= 0.4.0)
203 214 
       railties (>= 5.0)
204 215 
     websocket-driver (0.6.5)
205 216 
       websocket-extensions (>= 0.1.0)
206 
-    websocket-extensions (0.1.2)
217 
+    websocket-extensions (0.1.3)
207 218 
     will_paginate (3.1.6)
208 
-    x-editable-rails (1.5.5)
219 
+    x-editable-rails (1.5.5.1)
209 220 
       railties
210 
-    yard (0.9.8)
221 
+    yard (0.9.16)
211 222
212 223 
 PLATFORMS
213 224 
   ruby
 
@@ -229,7 +240,6 @@ DEPENDENCIES
229 240 
   haml
230 241 
   i18n_generators
231 242 
   icalendar
232 
-  jbuilder (~> 2.5)
233 243 
   jquery-rails
234 244 
   listen (~> 3.0.5)
235 245 
   mailgun_rails
 
@@ -252,4 +262,4 @@ DEPENDENCIES
252 262 
   yard
253 263
254 264 
 BUNDLED WITH
255 
-   1.16.4
265 
+   1.17.1