diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 19:12:10 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 21:00:30 +0100 |
| commit | a2a64ecd3e3551707412c47f0d16e484dea25632 (patch) | |
| tree | bc4e0b8e0ca2a2735f527bff8bd73421c0ff72dd /spec/models | |
| parent | fb0c906c717f2b21bb63610742a357850142b522 (diff) | |
| parent | 70801b850c78d7879182eeba4eae509af42fafeb (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/account_warning_preset_spec.rb | 5 | ||||
| -rw-r--r-- | spec/models/account_warning_spec.rb | 5 | ||||
| -rw-r--r-- | spec/models/scheduled_status_spec.rb | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/spec/models/account_warning_preset_spec.rb b/spec/models/account_warning_preset_spec.rb deleted file mode 100644 index a859a305f..000000000 --- a/spec/models/account_warning_preset_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe AccountWarningPreset, type: :model do - pending "add some examples to (or delete) #{__FILE__}" -end diff --git a/spec/models/account_warning_spec.rb b/spec/models/account_warning_spec.rb deleted file mode 100644 index 5286f9177..000000000 --- a/spec/models/account_warning_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe AccountWarning, type: :model do - pending "add some examples to (or delete) #{__FILE__}" -end diff --git a/spec/models/scheduled_status_spec.rb b/spec/models/scheduled_status_spec.rb new file mode 100644 index 000000000..f8c9d8b81 --- /dev/null +++ b/spec/models/scheduled_status_spec.rb @@ -0,0 +1,4 @@ +require 'rails_helper' + +RSpec.describe ScheduledStatus, type: :model do +end |