Skip to content

Commit ee6ae8b

Browse files
authored
Merge branch 'master' into fix-emoji-error-500
2 parents 8718b6e + c88f340 commit ee6ae8b

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ GEM
137137
factory_bot_rails (6.5.1)
138138
factory_bot (~> 6.5)
139139
railties (>= 6.1.0)
140-
faker (3.5.2)
140+
faker (3.5.3)
141141
i18n (>= 1.8.11, < 2)
142142
ffi (1.17.1)
143143
figaro (1.3.0)
@@ -388,10 +388,10 @@ GEM
388388
rexml (~> 3.2, >= 3.2.5)
389389
rubyzip (>= 1.2.2, < 3.0)
390390
websocket (~> 1.0)
391-
sentry-rails (6.1.0)
391+
sentry-rails (6.2.0)
392392
railties (>= 5.2.0)
393-
sentry-ruby (~> 6.1.0)
394-
sentry-ruby (6.1.0)
393+
sentry-ruby (~> 6.2.0)
394+
sentry-ruby (6.2.0)
395395
bigdecimal
396396
concurrent-ruby (~> 1.0, >= 1.0.2)
397397
simplecov (0.16.1)

app/assets/stylesheets/hackweek.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,9 @@ textarea.form-control {
245245
p {
246246
margin: 10px 0 0 0;
247247
}
248+
img {
249+
max-width: 100%;
250+
}
248251
}
249252

250253
.media-heading {

0 commit comments

Comments
 (0)