Skip to content

Commit 0a48a11

Browse files
committed
Merge branch 'hotfixes'
update application js with popper for portfolio nav function
2 parents 3ddc962 + 56da651 commit 0a48a11

File tree

3 files changed

+28
-0
lines changed

3 files changed

+28
-0
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,5 @@ end
5151

5252
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
5353
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
54+
55+
gem "popper", "~> 0.5.1"

Gemfile.lock

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ GEM
112112
railties (>= 3.2)
113113
erubi (1.10.0)
114114
execjs (2.7.0)
115+
faraday (1.3.0)
116+
faraday-net_http (~> 1.0)
117+
multipart-post (>= 1.2, < 3)
118+
ruby2_keywords
119+
faraday-net_http (1.0.1)
115120
ffi (1.14.2)
116121
font-awesome-rails (4.7.0.6)
117122
railties (>= 3.2, < 6.2)
@@ -165,14 +170,26 @@ GEM
165170
mini_portile2 (2.5.0)
166171
minitest (5.14.3)
167172
msgpack (1.3.3)
173+
multipart-post (2.1.1)
168174
nio4r (2.5.4)
169175
nokogiri (1.11.1)
170176
mini_portile2 (~> 2.5.0)
171177
racc (~> 1.4)
178+
octokit (4.20.0)
179+
faraday (>= 0.9)
180+
sawyer (~> 0.8.0, >= 0.5.3)
172181
orm_adapter (0.5.0)
182+
parslet (1.8.2)
173183
petergate (2.0.1)
174184
activerecord (> 4.0.0)
175185
pg (1.2.3)
186+
popper (0.5.1)
187+
bundler
188+
mail
189+
octokit
190+
slack-notifier
191+
thor
192+
toml
176193
popper_js (1.16.0)
177194
pry (0.13.1)
178195
coderay (~> 1.1)
@@ -221,6 +238,7 @@ GEM
221238
railties (>= 5.0)
222239
ruby-vips (2.0.17)
223240
ffi (~> 1.9)
241+
ruby2_keywords (0.0.4)
224242
ruby_dep (1.5.0)
225243
sass (3.7.4)
226244
sass-listen (~> 4.0.0)
@@ -233,6 +251,10 @@ GEM
233251
sprockets (>= 2.8, < 4.0)
234252
sprockets-rails (>= 2.0, < 4.0)
235253
tilt (>= 1.1, < 3)
254+
sawyer (0.8.2)
255+
addressable (>= 2.3.5)
256+
faraday (> 0.8, < 2.0)
257+
slack-notifier (2.3.2)
236258
spring (2.1.1)
237259
spring-watcher-listen (2.0.1)
238260
listen (>= 2.7, < 4.0)
@@ -247,6 +269,8 @@ GEM
247269
thor (1.0.1)
248270
thread_safe (0.3.6)
249271
tilt (2.0.10)
272+
toml (0.2.0)
273+
parslet (~> 1.8.0)
250274
turbolinks (5.2.1)
251275
turbolinks-source (~> 5.2)
252276
turbolinks-source (5.2.0)
@@ -292,6 +316,7 @@ DEPENDENCIES
292316
mini_magick (~> 4.10, >= 4.10.1)
293317
petergate
294318
pg (>= 0.18, < 2.0)
319+
popper (~> 0.5.1)
295320
pry-byebug
296321
puma (~> 3.11)
297322
rails (~> 5.2.4, >= 5.2.4.3)

app/assets/javascripts/application.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
1111
// about supported directives.
1212
//
13+
//= require popper
1314
//= require jquery
1415
//= require bootstrap-sprockets
1516
//= require rails-ujs

0 commit comments

Comments
 (0)