Skip to content

Commit

Permalink
Merge branch 'master' into dry-rb
Browse files Browse the repository at this point in the history
  • Loading branch information
acmetech committed Feb 11, 2020
2 parents 7d5e200 + 22a00ca commit 16e4052
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
# Ignore master key for decrypting credentials and more.
/config/master.key

# Ignore the RSpec state file
spec/examples.txt



#
# Review the ignored items below
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (4.0.3)
rack (2.1.2)
rack (2.2.1)
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
Expand Down Expand Up @@ -390,7 +390,7 @@ GEM
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sexp_processor (4.14.0)
sexp_processor (4.14.1)
shoulda-matchers (4.2.0)
activesupport (>= 4.2.0)
simple_form (5.0.2)
Expand Down Expand Up @@ -420,7 +420,7 @@ GEM
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.10)
tins (1.24.0)
tins (1.24.1)
sync
tzinfo (1.2.6)
thread_safe (~> 0.1)
Expand Down

0 comments on commit 16e4052

Please sign in to comment.