Skip to content

Commit

Permalink
Merge pull request #162 from hitobito/feature/2609-migration-leftover…
Browse files Browse the repository at this point in the history
…-tasks

feature/2609-migration-leftover-tasks
  • Loading branch information
Vakmeth authored Sep 19, 2024
2 parents 335ed49 + 3db4045 commit 4922c4b
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 22 deletions.
1 change: 0 additions & 1 deletion app/controllers/event/course_records_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ def return_path
edit_group_event_course_record_path(*parents)
end

# with mysql when saving value 1 it is rerenderd as 1.0 which is considered decimal
def replace_decimal_with_integer
return unless entry.duration_in_hours?

Expand Down
5 changes: 0 additions & 5 deletions config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ application:
# Initially, a password reset token may be mailed from the application to this address to set a password.
root_email: [email protected]

sphinx:
index:
# interval to index for full-text search in minutes
interval: 5

groups:
statistics:
enabled: false
Expand Down
14 changes: 0 additions & 14 deletions lib/tasks/tarantula.rake

This file was deleted.

4 changes: 2 additions & 2 deletions spec/controllers/event/course_records_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
let(:dom) { Capybara::Node::Simple.new(response.body) }
let(:event) { Fabricate(:course, groups: [group], leistungskategorie: leistungskategorie, fachkonzept: fachkonzept) }

context "for sk", db: :mysql do
context "for sk", db: :postgres do
let(:leistungskategorie) { "sk" }
let(:fachkonzept) { "sport_jugend" }

Expand All @@ -157,7 +157,7 @@
end
end

context "for tp", db: :mysql do
context "for tp", db: :postgres do
let(:leistungskategorie) { "tp" }
let(:fachkonzept) { "treffpunkt" }

Expand Down

0 comments on commit 4922c4b

Please sign in to comment.