diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-12-09 13:28:09 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-12-09 16:08:04 +0100 |
| commit | e7f1bfdc2d528f137299ba0c3ab2a30f2f91f53c (patch) | |
| tree | 2693ffce4d340a9b77a7ca52c856aaae7af8c913 /spec/models/account_pin_spec.rb | |
| parent | e3682c9c1750e5e7e5d2f817e29f6760a18400ca (diff) | |
| parent | 81bda7d67c984c9bfcb5bca94e50cec6405b492e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.
Diffstat (limited to 'spec/models/account_pin_spec.rb')
| -rw-r--r-- | spec/models/account_pin_spec.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/spec/models/account_pin_spec.rb b/spec/models/account_pin_spec.rb deleted file mode 100644 index 4f226b127..000000000 --- a/spec/models/account_pin_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe AccountPin, type: :model do - pending "add some examples to (or delete) #{__FILE__}" -end |