diff --git a/app/views/codeharbor_links/edit.html.slim b/app/views/codeharbor_links/edit.html.slim index 43a92c7e..1ccf2a3b 100644 --- a/app/views/codeharbor_links/edit.html.slim +++ b/app/views/codeharbor_links/edit.html.slim @@ -1,3 +1,3 @@ -h1 = 'Codeharbor link' +h1 = CodeharborLink.model_name.human = render('form') diff --git a/app/views/internal_users/show.html.slim b/app/views/internal_users/show.html.slim index 6e876ec9..71a16383 100644 --- a/app/views/internal_users/show.html.slim +++ b/app/views/internal_users/show.html.slim @@ -9,8 +9,3 @@ h1 = row(label: 'internal_user.activated', value: @user.activated?) = row(label: 'codeharbor_link.profile_label', value: @user.codeharbor_link.nil? ? link_to(t('codeharbor_link.new'), new_codeharbor_link_path, class: 'btn btn-secondary') : link_to(t('codeharbor_link.edit'), edit_codeharbor_link_path(@user.codeharbor_link), class: 'btn btn-secondary')) - -/ - if @user.codeharbor_link.nil? -/ = row(label: 'codeharbor_link.profile_label', value: link_to(t('codeharbor_link.new'), codeharbor_link_new_path, class: 'btn btn-secondary')) -/ - else -/ = row(label: 'codeharbor_link.profile_label', value: link_to(t('codeharbor_link.edit'), edit_codeharbor_link_path(@user.codeharbor_link), class: 'btn btn-secondary')) diff --git a/config/environments/development.rb b/config/environments/development.rb index ba0880a5..b91a19b5 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -3,15 +3,15 @@ Rails.application.configure do config.webpacker.check_yarn_integrity = true # Settings specified here will take precedence over those in config/application.rb. - config.web_console.whitelisted_ips = '192.168.0.0/16' - + config.web_console.whitelisted_ips = '192.168.0.0/16' + # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. config.cache_classes = false # Do not eager load code on boot. - config.eager_load = true + config.eager_load = false # Show full error reports. config.consider_all_requests_local = true diff --git a/db/schema.rb b/db/schema.rb index d86763dd..1f82e621 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_08_30_142809) do +ActiveRecord::Schema.define(version: 2019_09_05_152630) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -154,6 +154,7 @@ ActiveRecord::Schema.define(version: 2019_08_30_142809) do t.boolean "allow_auto_completion", default: false t.integer "expected_difficulty", default: 1 t.uuid "uuid" + t.string "import_checksum" t.index ["id"], name: "index_exercises_on_id" end diff --git a/lib/file_io.rb b/lib/file_io.rb index 39627b99..b19ef187 100644 --- a/lib/file_io.rb +++ b/lib/file_io.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -# stole from: https://makandracards.com/makandra/50526-fileio-writing-strings-as-carrierwave-uploads +# stolen from: https://makandracards.com/makandra/50526-fileio-writing-strings-as-carrierwave-uploads class FileIO < StringIO def initialize(stream, filename) super(stream)