Skip to content
This repository was archived by the owner on Aug 27, 2019. It is now read-only.

Commit 4213651

Browse files
committed
Update gems
1 parent f07918e commit 4213651

File tree

3 files changed

+54
-51
lines changed

3 files changed

+54
-51
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ group :development, :test do
3434
gem "coveralls", require: false
3535
gem "dotenv-rails"
3636
gem "shoulda-context"
37-
gem "shoulda-matchers"
37+
gem "shoulda-matchers", "~> 2.8.0"
3838
gem "mailcatcher", github: "sj26/mailcatcher"
3939
gem "minitest"
4040
gem "minitest-reporters"

Gemfile.lock

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ GEM
5151
tzinfo (~> 1.1)
5252
addressable (2.3.8)
5353
ansi (1.5.0)
54-
arel (6.0.0)
55-
autoprefixer-rails (5.2.0.1)
54+
arel (6.0.3)
55+
autoprefixer-rails (6.0.3)
5656
execjs
5757
json
5858
better_errors (2.1.1)
@@ -61,10 +61,10 @@ GEM
6161
rack (>= 0.9.0)
6262
binding_of_caller (0.7.2)
6363
debug_inspector (>= 0.0.1)
64-
bootstrap-sass (3.3.5)
64+
bootstrap-sass (3.3.5.1)
6565
autoprefixer-rails (>= 5.0.0.1)
66-
sass (>= 3.2.19)
67-
bootswatch-rails (3.3.4)
66+
sass (>= 3.3.0)
67+
bootswatch-rails (3.3.5)
6868
railties (>= 3.1)
6969
builder (3.2.2)
7070
coderay (1.1.0)
@@ -75,68 +75,68 @@ GEM
7575
coffee-script-source
7676
execjs
7777
coffee-script-source (1.9.1.1)
78-
coveralls (0.8.1)
78+
coveralls (0.8.3)
7979
json (~> 1.8)
8080
rest-client (>= 1.6.8, < 2)
8181
simplecov (~> 0.10.0)
8282
term-ansicolor (~> 1.3)
8383
thor (~> 0.19.1)
84-
css_parser (1.3.6)
84+
css_parser (1.3.7)
8585
addressable
86-
daemons (1.2.2)
86+
daemons (1.2.3)
8787
dalli (2.7.4)
8888
debug_inspector (0.0.2)
8989
docile (1.1.5)
90-
domain_name (0.5.24)
90+
domain_name (0.5.25)
9191
unf (>= 0.0.5, < 1.0.0)
9292
dotenv (2.0.2)
9393
dotenv-rails (2.0.2)
9494
dotenv (= 2.0.2)
9595
railties (~> 4.0)
9696
erubis (2.7.0)
9797
eventmachine (1.0.5)
98-
execjs (2.5.2)
98+
execjs (2.6.0)
9999
factory_girl (4.5.0)
100100
activesupport (>= 3.0.0)
101101
factory_girl_rails (4.5.0)
102102
factory_girl (~> 4.5.0)
103103
railties (>= 3.0.0)
104-
faraday (0.9.1)
104+
faraday (0.9.2)
105105
multipart-post (>= 1.2, < 3)
106-
globalid (0.3.5)
106+
globalid (0.3.6)
107107
activesupport (>= 4.1.0)
108-
haml (4.0.6)
108+
haml (4.0.7)
109109
tilt
110110
hashie (3.4.2)
111-
htmlentities (4.3.3)
111+
htmlentities (4.3.4)
112112
http-cookie (1.0.2)
113113
domain_name (~> 0.5)
114114
i18n (0.7.0)
115-
jquery-rails (4.0.4)
115+
jquery-rails (4.0.5)
116116
rails-dom-testing (~> 1.0)
117117
railties (>= 4.2.0)
118118
thor (>= 0.14, < 2.0)
119119
json (1.8.3)
120-
jwt (1.5.0)
121-
kgio (2.9.3)
122-
loofah (2.0.2)
120+
jwt (1.5.1)
121+
kgio (2.10.0)
122+
loofah (2.0.3)
123123
nokogiri (>= 1.5.9)
124124
mail (2.6.3)
125125
mime-types (>= 1.16, < 3)
126126
maruku (0.7.2)
127127
metaclass (0.0.4)
128128
method_source (0.8.2)
129-
mime-types (2.6.1)
129+
mime-types (2.6.2)
130130
mini_portile (0.6.2)
131-
minitest (5.7.0)
132-
minitest-reporters (1.0.17)
131+
minitest (5.8.1)
132+
minitest-reporters (1.1.3)
133133
ansi
134134
builder
135135
minitest (>= 5.0)
136136
ruby-progressbar
137137
mocha (1.1.0)
138138
metaclass (~> 0.0.1)
139-
multi_json (1.11.1)
139+
multi_json (1.11.2)
140140
multi_xml (0.5.5)
141141
multipart-post (2.0.0)
142142
netrc (0.10.3)
@@ -162,26 +162,26 @@ GEM
162162
omniauth-oauth (1.1.0)
163163
oauth
164164
omniauth (~> 1.0)
165-
omniauth-oauth2 (1.3.0)
165+
omniauth-oauth2 (1.3.1)
166166
oauth2 (~> 1.0)
167167
omniauth (~> 1.2)
168-
omniauth-twitter (1.2.0)
168+
omniauth-twitter (1.2.1)
169169
json (~> 1.3)
170170
omniauth-oauth (~> 1.1)
171-
pg (0.18.2)
172-
postmark (1.5.0)
171+
pg (0.18.3)
172+
postmark (1.7.0)
173173
json
174174
rake
175-
postmark-rails (0.10.0)
175+
postmark-rails (0.12.0)
176176
actionmailer (>= 3.0.0)
177-
postmark (~> 1.5.0)
178-
premailer (1.8.4)
177+
postmark (~> 1.7.0)
178+
premailer (1.8.6)
179179
css_parser (>= 1.3.6)
180180
htmlentities (>= 4.0.0)
181181
premailer-rails (1.8.2)
182182
actionmailer (>= 3, < 5)
183183
premailer (~> 1.7, >= 1.7.9)
184-
pry (0.10.1)
184+
pry (0.10.3)
185185
coderay (~> 1.1.0)
186186
method_source (~> 0.8.1)
187187
slop (~> 3.4)
@@ -205,7 +205,7 @@ GEM
205205
sprockets-rails
206206
rails-deprecated_sanitizer (1.0.3)
207207
activesupport (>= 4.2.0.alpha)
208-
rails-dom-testing (1.0.6)
208+
rails-dom-testing (1.0.7)
209209
activesupport (>= 4.2.0.beta, < 5.0)
210210
nokogiri (~> 1.6.0)
211211
rails-deprecated_sanitizer (>= 1.0.1)
@@ -215,27 +215,27 @@ GEM
215215
rails_serve_static_assets
216216
rails_stdout_logging
217217
rails_serve_static_assets (0.0.4)
218-
rails_stdout_logging (0.0.3)
218+
rails_stdout_logging (0.0.4)
219219
railties (4.2.2)
220220
actionpack (= 4.2.2)
221221
activesupport (= 4.2.2)
222222
rake (>= 0.8.7)
223223
thor (>= 0.18.1, < 2.0)
224-
raindrops (0.13.0)
224+
raindrops (0.15.0)
225225
rake (10.4.2)
226226
rest-client (1.8.0)
227227
http-cookie (>= 1.0.2, < 2.0)
228228
mime-types (>= 1.16, < 3.0)
229229
netrc (~> 0.7)
230230
ruby-progressbar (1.7.5)
231-
sass (3.4.14)
232-
sass-rails (5.0.3)
231+
sass (3.4.19)
232+
sass-rails (5.0.4)
233233
railties (>= 4.0.0, < 5.0)
234234
sass (~> 3.1)
235235
sprockets (>= 2.8, < 4.0)
236236
sprockets-rails (>= 2.0, < 4.0)
237-
tilt (~> 1.1)
238-
sentry-raven (0.13.3)
237+
tilt (>= 1.1, < 3)
238+
sentry-raven (0.15.2)
239239
faraday (>= 0.7.6)
240240
shoulda-context (1.2.1)
241241
shoulda-matchers (2.8.0)
@@ -253,28 +253,28 @@ GEM
253253
eventmachine (~> 1.0.0)
254254
thin (~> 1.5.0)
255255
slop (3.6.0)
256-
sprockets (3.2.0)
257-
rack (~> 1.0)
258-
sprockets-rails (2.3.1)
256+
sprockets (3.4.0)
257+
rack (> 1, < 3)
258+
sprockets-rails (2.3.3)
259259
actionpack (>= 3.0)
260260
activesupport (>= 3.0)
261261
sprockets (>= 2.8, < 4.0)
262-
sqlite3 (1.3.10)
263-
term-ansicolor (1.3.1)
262+
sqlite3 (1.3.11)
263+
term-ansicolor (1.3.2)
264264
tins (~> 1.0)
265265
thin (1.5.1)
266266
daemons (>= 1.0.9)
267267
eventmachine (>= 0.12.6)
268268
rack (>= 1.0.0)
269269
thor (0.19.1)
270270
thread_safe (0.3.5)
271-
tilt (1.4.1)
272-
tins (1.5.2)
271+
tilt (2.0.1)
272+
tins (1.6.0)
273273
turbolinks (2.5.3)
274274
coffee-rails
275275
tzinfo (1.2.2)
276276
thread_safe (~> 0.1)
277-
uglifier (2.7.1)
277+
uglifier (2.7.2)
278278
execjs (>= 0.3.0)
279279
json (>= 1.8.0)
280280
unf (0.1.4)
@@ -320,7 +320,10 @@ DEPENDENCIES
320320
sass-rails (~> 5.0)
321321
sentry-raven
322322
shoulda-context
323-
shoulda-matchers
323+
shoulda-matchers (~> 2.8.0)
324324
turbolinks (~> 2.5)
325325
uglifier (~> 2.7)
326326
unicorn
327+
328+
BUNDLED WITH
329+
1.10.6

db/schema.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
enable_extension "plpgsql"
1818
enable_extension "hstore"
1919

20-
create_table "events", force: true do |t|
20+
create_table "events", force: :cascade do |t|
2121
t.string "name"
2222
t.text "description"
2323
t.datetime "starts_at"
@@ -28,7 +28,7 @@
2828
t.datetime "updated_at"
2929
end
3030

31-
create_table "identities", force: true do |t|
31+
create_table "identities", force: :cascade do |t|
3232
t.string "provider"
3333
t.string "uid"
3434
t.string "token"
@@ -43,7 +43,7 @@
4343
t.integer "user_id"
4444
end
4545

46-
create_table "responses", force: true do |t|
46+
create_table "responses", force: :cascade do |t|
4747
t.integer "user_id"
4848
t.string "organization"
4949
t.integer "additional_guests", default: 0
@@ -55,7 +55,7 @@
5555

5656
add_index "responses", ["event_id"], name: "index_responses_on_event_id", using: :btree
5757

58-
create_table "users", force: true do |t|
58+
create_table "users", force: :cascade do |t|
5959
t.string "first_name"
6060
t.string "last_name"
6161
t.string "email"

0 commit comments

Comments
 (0)