diff --git a/app/models/talk.rb b/app/models/talk.rb
index 2b06034..fdccbef 100644
--- a/app/models/talk.rb
+++ b/app/models/talk.rb
@@ -1,7 +1,7 @@
class Talk < ActiveResource::Base
has_many :selections, class_name: 'SelectedTalk'
- self.site = "https://cfp.openfest.org/api/conferences/5"
+ self.site = "https://cfp.openfest.org/api/conferences/6"
self.element_name = "event"
def self.ordered_by_id
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 1677616..80c2524 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -72,10 +72,10 @@
-
-OpenBiz
-Civic Hacking
-Social
-OpenArt
-Advanced Technical
-Education
+
+Advanced Technical
+OpenBiz
+Civic Hacking
+Social
+OpenArt
+Education
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index dd83b6b..1ba4e38 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1,6 +1,6 @@
bg:
generic:
- title: Възможни лекции за OpenFest 2018
+ title: Възможни лекции за OpenFest 2019
submit: Изпрати
store_and_submit_changes: Запази локално промените и ги изпрати, ако е възможно
help_us_reduce_the_conflicts: Помогнете ни да намалим конфликтите в програмата на OpenFest
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fd36026..3827dbe 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,6 +1,6 @@
en:
generic:
- title: OpenFest 2018 Talk Preference Poll
+ title: OpenFest 2019 Talk Preference Poll
submit: Submit
store_and_submit_changes: Store your changes locally and submit them if possible
help_us_reduce_the_conflicts: "Help us to reduce the conflicts in OpenFest's schedule"
diff --git a/db/migrate/20151005104151_create_talk_preferences.rb b/db/migrate/20151005104151_create_talk_preferences.rb
index 1778c41..34bc20c 100644
--- a/db/migrate/20151005104151_create_talk_preferences.rb
+++ b/db/migrate/20151005104151_create_talk_preferences.rb
@@ -1,4 +1,4 @@
-class CreateTalkPreferences < ActiveRecord::Migration
+class CreateTalkPreferences < ActiveRecord::Migration[4.2]
def change
create_table :talk_preferences, id: false do |t|
t.string :unique_id, null: false
diff --git a/db/migrate/20151006120338_add_hashed_unique_id_to_talk_preferences.rb b/db/migrate/20151006120338_add_hashed_unique_id_to_talk_preferences.rb
index 7785f3f..0c01e90 100644
--- a/db/migrate/20151006120338_add_hashed_unique_id_to_talk_preferences.rb
+++ b/db/migrate/20151006120338_add_hashed_unique_id_to_talk_preferences.rb
@@ -1,4 +1,4 @@
-class AddHashedUniqueIdToTalkPreferences < ActiveRecord::Migration
+class AddHashedUniqueIdToTalkPreferences < ActiveRecord::Migration[4.2]
def change
add_column :talk_preferences, :hashed_unique_id, :string
add_index :talk_preferences, :hashed_unique_id
diff --git a/db/migrate/20151006121008_populate_hashed_unique_id_in_talk_preferences.rb b/db/migrate/20151006121008_populate_hashed_unique_id_in_talk_preferences.rb
index bd37328..0f09ebf 100644
--- a/db/migrate/20151006121008_populate_hashed_unique_id_in_talk_preferences.rb
+++ b/db/migrate/20151006121008_populate_hashed_unique_id_in_talk_preferences.rb
@@ -2,7 +2,7 @@ class TalkPreference < ActiveRecord::Base
self.primary_key = :unique_id
end
-class PopulateHashedUniqueIdInTalkPreferences < ActiveRecord::Migration
+class PopulateHashedUniqueIdInTalkPreferences < ActiveRecord::Migration[4.2]
def up
TalkPreference.all.each do |talk_preference|
talk_preference.hashed_unique_id = Digest::SHA1.hexdigest(talk_preference.unique_id)