diff options
-rw-r--r-- | Gemfile | 4 | ||||
-rw-r--r-- | Gemfile.lock | 204 |
2 files changed, 105 insertions, 103 deletions
diff --git a/Gemfile b/Gemfile index 4561c51..0bf9828 100644 --- a/Gemfile +++ b/Gemfile | |||
@@ -7,13 +7,13 @@ end | |||
7 | 7 | ||
8 | 8 | ||
9 | # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | 9 | # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' |
10 | gem 'rails', '~> 5.1.4' | 10 | gem 'rails', '~> 5.2.0' |
11 | # Use sqlite3 as the database for Active Record | 11 | # Use sqlite3 as the database for Active Record |
12 | gem 'sqlite3' | 12 | gem 'sqlite3' |
13 | # Use Puma as the app server | 13 | # Use Puma as the app server |
14 | gem 'puma', '~> 3.7' | 14 | gem 'puma', '~> 3.7' |
15 | # Use SCSS for stylesheets | 15 | # Use SCSS for stylesheets |
16 | gem 'sass-rails', '~> 5.0' | 16 | gem 'sassc-rails' |
17 | # Use Uglifier as compressor for JavaScript assets | 17 | # Use Uglifier as compressor for JavaScript assets |
18 | gem 'uglifier', '>= 1.3.0' | 18 | gem 'uglifier', '>= 1.3.0' |
19 | # See https://github.com/rails/execjs#readme for more supported runtimes | 19 | # See https://github.com/rails/execjs#readme for more supported runtimes |
diff --git a/Gemfile.lock b/Gemfile.lock index ae55c62..4ccb35c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock | |||
@@ -1,6 +1,6 @@ | |||
1 | GIT | 1 | GIT |
2 | remote: https://github.com/hatkirby/pokeviewer.git | 2 | remote: https://github.com/hatkirby/pokeviewer.git |
3 | revision: f1d4da70ccb3d298cc7cf1cdcde2748048238dab | 3 | revision: 8faa7aa636a8fc6f0c227d9258b502e4aa3a6541 |
4 | specs: | 4 | specs: |
5 | pokeviewer (0.1.0) | 5 | pokeviewer (0.1.0) |
6 | activerecord-diff | 6 | activerecord-diff |
@@ -9,48 +9,52 @@ GIT | |||
9 | haml | 9 | haml |
10 | jquery-rails | 10 | jquery-rails |
11 | normalize-rails | 11 | normalize-rails |
12 | rails (~> 5.1.4) | 12 | rails (~> 5.2.0) |
13 | sass-rails (~> 5.0) | 13 | sassc-rails |
14 | sequenced | 14 | sequenced |
15 | victor | 15 | victor |
16 | 16 | ||
17 | GEM | 17 | GEM |
18 | remote: https://rubygems.org/ | 18 | remote: https://rubygems.org/ |
19 | specs: | 19 | specs: |
20 | actioncable (5.1.6) | 20 | actioncable (5.2.2) |
21 | actionpack (= 5.1.6) | 21 | actionpack (= 5.2.2) |
22 | nio4r (~> 2.0) | 22 | nio4r (~> 2.0) |
23 | websocket-driver (~> 0.6.1) | 23 | websocket-driver (>= 0.6.1) |
24 | actionmailer (5.1.6) | 24 | actionmailer (5.2.2) |
25 | actionpack (= 5.1.6) | 25 | actionpack (= 5.2.2) |
26 | actionview (= 5.1.6) | 26 | actionview (= 5.2.2) |
27 | activejob (= 5.1.6) | 27 | activejob (= 5.2.2) |
28 | mail (~> 2.5, >= 2.5.4) | 28 | mail (~> 2.5, >= 2.5.4) |
29 | rails-dom-testing (~> 2.0) | 29 | rails-dom-testing (~> 2.0) |
30 | actionpack (5.1.6) | 30 | actionpack (5.2.2) |
31 | actionview (= 5.1.6) | 31 | actionview (= 5.2.2) |
32 | activesupport (= 5.1.6) | 32 | activesupport (= 5.2.2) |
33 | rack (~> 2.0) | 33 | rack (~> 2.0) |
34 | rack-test (>= 0.6.3) | 34 | rack-test (>= 0.6.3) |
35 | rails-dom-testing (~> 2.0) | 35 | rails-dom-testing (~> 2.0) |
36 | rails-html-sanitizer (~> 1.0, >= 1.0.2) | 36 | rails-html-sanitizer (~> 1.0, >= 1.0.2) |
37 | actionview (5.1.6) | 37 | actionview (5.2.2) |
38 | activesupport (= 5.1.6) | 38 | activesupport (= 5.2.2) |
39 | builder (~> 3.1) | 39 | builder (~> 3.1) |
40 | erubi (~> 1.4) | 40 | erubi (~> 1.4) |
41 | rails-dom-testing (~> 2.0) | 41 | rails-dom-testing (~> 2.0) |
42 | rails-html-sanitizer (~> 1.0, >= 1.0.3) | 42 | rails-html-sanitizer (~> 1.0, >= 1.0.3) |
43 | activejob (5.1.6) | 43 | activejob (5.2.2) |
44 | activesupport (= 5.1.6) | 44 | activesupport (= 5.2.2) |
45 | globalid (>= 0.3.6) | 45 | globalid (>= 0.3.6) |
46 | activemodel (5.1.6) | 46 | activemodel (5.2.2) |
47 | activesupport (= 5.1.6) | 47 | activesupport (= 5.2.2) |
48 | activerecord (5.1.6) | 48 | activerecord (5.2.2) |
49 | activemodel (= 5.1.6) | 49 | activemodel (= 5.2.2) |
50 | activesupport (= 5.1.6) | 50 | activesupport (= 5.2.2) |
51 | arel (~> 8.0) | 51 | arel (>= 9.0) |
52 | activerecord-diff (2.0.0) | 52 | activerecord-diff (2.0.0) |
53 | activesupport (5.1.6) | 53 | activestorage (5.2.2) |
54 | actionpack (= 5.2.2) | ||
55 | activerecord (= 5.2.2) | ||
56 | marcel (~> 0.3.1) | ||
57 | activesupport (5.2.2) | ||
54 | concurrent-ruby (~> 1.0, >= 1.0.2) | 58 | concurrent-ruby (~> 1.0, >= 1.0.2) |
55 | i18n (>= 0.7, < 2) | 59 | i18n (>= 0.7, < 2) |
56 | minitest (~> 5.1) | 60 | minitest (~> 5.1) |
@@ -59,9 +63,9 @@ GEM | |||
59 | activerecord (~> 5.0) | 63 | activerecord (~> 5.0) |
60 | addressable (2.5.2) | 64 | addressable (2.5.2) |
61 | public_suffix (>= 2.0.2, < 4.0) | 65 | public_suffix (>= 2.0.2, < 4.0) |
62 | airbrussh (1.3.0) | 66 | airbrussh (1.3.1) |
63 | sshkit (>= 1.6.1, != 1.7.0) | 67 | sshkit (>= 1.6.1, != 1.7.0) |
64 | arel (8.0.0) | 68 | arel (9.0.0) |
65 | bcrypt (3.1.12) | 69 | bcrypt (3.1.12) |
66 | bindex (0.5.0) | 70 | bindex (0.5.0) |
67 | builder (3.2.3) | 71 | builder (3.2.3) |
@@ -71,9 +75,8 @@ GEM | |||
71 | i18n | 75 | i18n |
72 | rake (>= 10.0.0) | 76 | rake (>= 10.0.0) |
73 | sshkit (>= 1.9.0) | 77 | sshkit (>= 1.9.0) |
74 | capistrano-bundler (1.3.0) | 78 | capistrano-bundler (1.5.0) |
75 | capistrano (~> 3.1) | 79 | capistrano (~> 3.1) |
76 | sshkit (~> 1.2) | ||
77 | capistrano-passenger (0.2.0) | 80 | capistrano-passenger (0.2.0) |
78 | capistrano (~> 3.0) | 81 | capistrano (~> 3.0) |
79 | capistrano-rails (1.4.0) | 82 | capistrano-rails (1.4.0) |
@@ -91,12 +94,10 @@ GEM | |||
91 | xpath (>= 2.0, < 4.0) | 94 | xpath (>= 2.0, < 4.0) |
92 | childprocess (0.9.0) | 95 | childprocess (0.9.0) |
93 | ffi (~> 1.0, >= 1.0.11) | 96 | ffi (~> 1.0, >= 1.0.11) |
94 | ckeditor (4.2.4) | 97 | ckeditor (4.3.0) |
95 | cocaine | ||
96 | orm_adapter (~> 0.5.0) | 98 | orm_adapter (~> 0.5.0) |
99 | terrapin | ||
97 | climate_control (0.2.0) | 100 | climate_control (0.2.0) |
98 | cocaine (0.6.0) | ||
99 | terrapin (= 0.6.0) | ||
100 | coffee-rails (4.2.2) | 101 | coffee-rails (4.2.2) |
101 | coffee-script (>= 2.2.0) | 102 | coffee-script (>= 2.2.0) |
102 | railties (>= 4.0.0) | 103 | railties (>= 4.0.0) |
@@ -104,9 +105,9 @@ GEM | |||
104 | coffee-script-source | 105 | coffee-script-source |
105 | execjs | 106 | execjs |
106 | coffee-script-source (1.12.2) | 107 | coffee-script-source (1.12.2) |
107 | concurrent-ruby (1.0.5) | 108 | concurrent-ruby (1.1.4) |
108 | crass (1.0.4) | 109 | crass (1.0.4) |
109 | devise (4.4.3) | 110 | devise (4.5.0) |
110 | bcrypt (~> 3.0) | 111 | bcrypt (~> 3.0) |
111 | orm_adapter (~> 0.1) | 112 | orm_adapter (~> 0.1) |
112 | railties (>= 4.1.0, < 6.0) | 113 | railties (>= 4.1.0, < 6.0) |
@@ -114,18 +115,18 @@ GEM | |||
114 | warden (~> 1.2.3) | 115 | warden (~> 1.2.3) |
115 | enumerize (2.2.2) | 116 | enumerize (2.2.2) |
116 | activesupport (>= 3.2) | 117 | activesupport (>= 3.2) |
117 | erubi (1.7.1) | 118 | erubi (1.8.0) |
118 | execjs (2.7.0) | 119 | execjs (2.7.0) |
119 | ffi (1.9.25) | 120 | ffi (1.9.25) |
120 | globalid (0.4.1) | 121 | globalid (0.4.2) |
121 | activesupport (>= 4.2.0) | 122 | activesupport (>= 4.2.0) |
122 | haml (5.0.4) | 123 | haml (5.0.4) |
123 | temple (>= 0.8.0) | 124 | temple (>= 0.8.0) |
124 | tilt | 125 | tilt |
125 | highline (2.0.0) | 126 | highline (2.0.0) |
126 | i18n (1.0.1) | 127 | i18n (1.5.2) |
127 | concurrent-ruby (~> 1.0) | 128 | concurrent-ruby (~> 1.0) |
128 | jbuilder (2.7.0) | 129 | jbuilder (2.8.0) |
129 | activesupport (>= 4.2.0) | 130 | activesupport (>= 4.2.0) |
130 | multi_json (>= 1.2) | 131 | multi_json (>= 1.2) |
131 | jquery-rails (4.3.3) | 132 | jquery-rails (4.3.3) |
@@ -142,87 +143,88 @@ GEM | |||
142 | rb-fsevent (~> 0.9, >= 0.9.4) | 143 | rb-fsevent (~> 0.9, >= 0.9.4) |
143 | rb-inotify (~> 0.9, >= 0.9.7) | 144 | rb-inotify (~> 0.9, >= 0.9.7) |
144 | ruby_dep (~> 1.2) | 145 | ruby_dep (~> 1.2) |
145 | loofah (2.2.2) | 146 | loofah (2.2.3) |
146 | crass (~> 1.0.2) | 147 | crass (~> 1.0.2) |
147 | nokogiri (>= 1.5.9) | 148 | nokogiri (>= 1.5.9) |
148 | mail (2.7.0) | 149 | mail (2.7.1) |
149 | mini_mime (>= 0.1.1) | 150 | mini_mime (>= 0.1.1) |
150 | method_source (0.9.0) | 151 | marcel (0.3.3) |
151 | mime-types (3.1) | 152 | mimemagic (~> 0.3.2) |
153 | method_source (0.9.2) | ||
154 | mime-types (3.2.2) | ||
152 | mime-types-data (~> 3.2015) | 155 | mime-types-data (~> 3.2015) |
153 | mime-types-data (3.2016.0521) | 156 | mime-types-data (3.2018.0812) |
154 | mimemagic (0.3.2) | 157 | mimemagic (0.3.3) |
155 | mini_mime (1.0.0) | 158 | mini_mime (1.0.1) |
156 | mini_portile2 (2.3.0) | 159 | mini_portile2 (2.4.0) |
157 | minitest (5.11.3) | 160 | minitest (5.11.3) |
158 | multi_json (1.13.1) | 161 | multi_json (1.13.1) |
159 | mysql2 (0.5.1) | 162 | mysql2 (0.5.2) |
160 | net-scp (1.2.1) | 163 | net-scp (1.2.1) |
161 | net-ssh (>= 2.6.5) | 164 | net-ssh (>= 2.6.5) |
162 | net-ssh (5.0.2) | 165 | net-ssh (5.1.0) |
163 | nio4r (2.3.1) | 166 | nio4r (2.3.1) |
164 | nokogiri (1.8.4) | 167 | nokogiri (1.10.1) |
165 | mini_portile2 (~> 2.3.0) | 168 | mini_portile2 (~> 2.4.0) |
166 | normalize-rails (4.1.1) | 169 | normalize-rails (4.1.1) |
167 | orm_adapter (0.5.0) | 170 | orm_adapter (0.5.0) |
168 | paperclip (6.0.0) | 171 | paperclip (6.1.0) |
169 | activemodel (>= 4.2.0) | 172 | activemodel (>= 4.2.0) |
170 | activesupport (>= 4.2.0) | 173 | activesupport (>= 4.2.0) |
171 | mime-types | 174 | mime-types |
172 | mimemagic (~> 0.3.0) | 175 | mimemagic (~> 0.3.0) |
173 | terrapin (~> 0.6.0) | 176 | terrapin (~> 0.6.0) |
174 | public_suffix (3.0.2) | 177 | public_suffix (3.0.3) |
175 | puma (3.11.4) | 178 | puma (3.12.0) |
176 | rack (2.0.5) | 179 | rack (2.0.6) |
177 | rack-test (1.0.0) | 180 | rack-test (1.1.0) |
178 | rack (>= 1.0, < 3) | 181 | rack (>= 1.0, < 3) |
179 | rails (5.1.6) | 182 | rails (5.2.2) |
180 | actioncable (= 5.1.6) | 183 | actioncable (= 5.2.2) |
181 | actionmailer (= 5.1.6) | 184 | actionmailer (= 5.2.2) |
182 | actionpack (= 5.1.6) | 185 | actionpack (= 5.2.2) |
183 | actionview (= 5.1.6) | 186 | actionview (= 5.2.2) |
184 | activejob (= 5.1.6) | 187 | activejob (= 5.2.2) |
185 | activemodel (= 5.1.6) | 188 | activemodel (= 5.2.2) |
186 | activerecord (= 5.1.6) | 189 | activerecord (= 5.2.2) |
187 | activesupport (= 5.1.6) | 190 | activestorage (= 5.2.2) |
191 | activesupport (= 5.2.2) | ||
188 | bundler (>= 1.3.0) | 192 | bundler (>= 1.3.0) |
189 | railties (= 5.1.6) | 193 | railties (= 5.2.2) |
190 | sprockets-rails (>= 2.0.0) | 194 | sprockets-rails (>= 2.0.0) |
191 | rails-dom-testing (2.0.3) | 195 | rails-dom-testing (2.0.3) |
192 | activesupport (>= 4.2.0) | 196 | activesupport (>= 4.2.0) |
193 | nokogiri (>= 1.6) | 197 | nokogiri (>= 1.6) |
194 | rails-html-sanitizer (1.0.4) | 198 | rails-html-sanitizer (1.0.4) |
195 | loofah (~> 2.2, >= 2.2.2) | 199 | loofah (~> 2.2, >= 2.2.2) |
196 | railties (5.1.6) | 200 | railties (5.2.2) |
197 | actionpack (= 5.1.6) | 201 | actionpack (= 5.2.2) |
198 | activesupport (= 5.1.6) | 202 | activesupport (= 5.2.2) |
199 | method_source | 203 | method_source |
200 | rake (>= 0.8.7) | 204 | rake (>= 0.8.7) |
201 | thor (>= 0.18.1, < 2.0) | 205 | thor (>= 0.19.0, < 2.0) |
202 | rake (12.3.1) | 206 | rake (12.3.2) |
203 | rb-fsevent (0.10.3) | 207 | rb-fsevent (0.10.3) |
204 | rb-inotify (0.9.10) | 208 | rb-inotify (0.10.0) |
205 | ffi (>= 0.5.0, < 2) | 209 | ffi (~> 1.0) |
206 | ref (2.0.0) | 210 | ref (2.0.0) |
207 | responders (2.4.0) | 211 | responders (2.4.0) |
208 | actionpack (>= 4.2.0, < 5.3) | 212 | actionpack (>= 4.2.0, < 5.3) |
209 | railties (>= 4.2.0, < 5.3) | 213 | railties (>= 4.2.0, < 5.3) |
210 | ruby_dep (1.5.0) | 214 | ruby_dep (1.5.0) |
211 | rubyzip (1.2.1) | 215 | rubyzip (1.2.2) |
212 | sass (3.5.6) | 216 | sassc (2.0.0) |
213 | sass-listen (~> 4.0.0) | 217 | ffi (~> 1.9.6) |
214 | sass-listen (4.0.0) | 218 | rake |
215 | rb-fsevent (~> 0.9, >= 0.9.4) | 219 | sassc-rails (2.1.0) |
216 | rb-inotify (~> 0.9, >= 0.9.7) | 220 | railties (>= 4.0.0) |
217 | sass-rails (5.0.7) | 221 | sassc (>= 2.0) |
218 | railties (>= 4.0.0, < 6) | 222 | sprockets (> 3.0) |
219 | sass (~> 3.1) | 223 | sprockets-rails |
220 | sprockets (>= 2.8, < 4.0) | 224 | tilt |
221 | sprockets-rails (>= 2.0, < 4.0) | 225 | selenium-webdriver (3.141.0) |
222 | tilt (>= 1.1, < 3) | ||
223 | selenium-webdriver (3.13.0) | ||
224 | childprocess (~> 0.5) | 226 | childprocess (~> 0.5) |
225 | rubyzip (~> 1.2) | 227 | rubyzip (~> 1.2, >= 1.2.2) |
226 | sequenced (3.1.1) | 228 | sequenced (3.1.1) |
227 | activerecord (>= 3.0) | 229 | activerecord (>= 3.0) |
228 | activesupport (>= 3.0) | 230 | activesupport (>= 3.0) |
@@ -239,7 +241,7 @@ GEM | |||
239 | activesupport (>= 4.0) | 241 | activesupport (>= 4.0) |
240 | sprockets (>= 3.0.0) | 242 | sprockets (>= 3.0.0) |
241 | sqlite3 (1.3.13) | 243 | sqlite3 (1.3.13) |
242 | sshkit (1.16.1) | 244 | sshkit (1.18.0) |
243 | net-scp (>= 1.1.2) | 245 | net-scp (>= 1.1.2) |
244 | net-ssh (>= 2.8.0) | 246 | net-ssh (>= 2.8.0) |
245 | temple (0.8.0) | 247 | temple (0.8.0) |
@@ -248,28 +250,28 @@ GEM | |||
248 | therubyracer (0.12.3) | 250 | therubyracer (0.12.3) |
249 | libv8 (~> 3.16.14.15) | 251 | libv8 (~> 3.16.14.15) |
250 | ref | 252 | ref |
251 | thor (0.20.0) | 253 | thor (0.20.3) |
252 | thread_safe (0.3.6) | 254 | thread_safe (0.3.6) |
253 | tilt (2.0.8) | 255 | tilt (2.0.9) |
254 | turbolinks (5.1.1) | 256 | turbolinks (5.2.0) |
255 | turbolinks-source (~> 5.1) | 257 | turbolinks-source (~> 5.2) |
256 | turbolinks-source (5.1.0) | 258 | turbolinks-source (5.2.0) |
257 | tzinfo (1.2.5) | 259 | tzinfo (1.2.5) |
258 | thread_safe (~> 0.1) | 260 | thread_safe (~> 0.1) |
259 | uglifier (4.1.14) | 261 | uglifier (4.1.20) |
260 | execjs (>= 0.3.0, < 3) | 262 | execjs (>= 0.3.0, < 3) |
261 | victor (0.2.1) | 263 | victor (0.2.4) |
262 | warden (1.2.7) | 264 | warden (1.2.8) |
263 | rack (>= 1.0) | 265 | rack (>= 2.0.6) |
264 | web-console (3.6.2) | 266 | web-console (3.7.0) |
265 | actionview (>= 5.0) | 267 | actionview (>= 5.0) |
266 | activemodel (>= 5.0) | 268 | activemodel (>= 5.0) |
267 | bindex (>= 0.4.0) | 269 | bindex (>= 0.4.0) |
268 | railties (>= 5.0) | 270 | railties (>= 5.0) |
269 | websocket-driver (0.6.5) | 271 | websocket-driver (0.7.0) |
270 | websocket-extensions (>= 0.1.0) | 272 | websocket-extensions (>= 0.1.0) |
271 | websocket-extensions (0.1.3) | 273 | websocket-extensions (0.1.3) |
272 | xpath (3.1.0) | 274 | xpath (3.2.0) |
273 | nokogiri (~> 1.8) | 275 | nokogiri (~> 1.8) |
274 | 276 | ||
275 | PLATFORMS | 277 | PLATFORMS |
@@ -299,8 +301,8 @@ DEPENDENCIES | |||
299 | paperclip | 301 | paperclip |
300 | pokeviewer! | 302 | pokeviewer! |
301 | puma (~> 3.7) | 303 | puma (~> 3.7) |
302 | rails (~> 5.1.4) | 304 | rails (~> 5.2.0) |
303 | sass-rails (~> 5.0) | 305 | sassc-rails |
304 | selenium-webdriver | 306 | selenium-webdriver |
305 | spring | 307 | spring |
306 | spring-watcher-listen (~> 2.0.0) | 308 | spring-watcher-listen (~> 2.0.0) |