diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store deleted file mode 100644 index 29fe5375..00000000 Binary files a/app/assets/.DS_Store and /dev/null differ diff --git a/app/assets/javascripts/.DS_Store b/app/assets/javascripts/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/app/assets/javascripts/.DS_Store and /dev/null differ diff --git a/app/views/exercises/_file_form.html.slim b/app/views/exercises/_file_form.html.slim index 642e0ee7..2acafa34 100644 --- a/app/views/exercises/_file_form.html.slim +++ b/app/views/exercises/_file_form.html.slim @@ -1,6 +1,5 @@ - id = f.object.id - file= f.object.files.first -//- exercise_arg = @exercise li.panel.panel-default .panel-heading role="tab" id="heading" @@ -39,7 +38,8 @@ li.panel.panel-default .form-group = f.label(:role, t('activerecord.attributes.file.weight')) = f.number_field(:weight, class: 'form-control', min: 1, step: 'any') - .frame data-executable=file.file_type.executable? data-filename=file.name_with_extension data-renderable=file.file_type.renderable? data-role=file.role data-binary=file.file_type.binary? data-context-type=file.context_type + = f.label(file.id) + /.frame data-executable=file.file_type.executable? data-filename=file.name_with_extension data-renderable=file.file_type.renderable? data-role=file.role data-binary=file.file_type.binary? data-context-type=file.context_type - if file.file_type.binary? .binary-file data-file-id=file.ancestor_id - if file.file_type.renderable? diff --git a/config/application.rb b/config/application.rb index 4b2a543a..b450c891 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,6 +22,8 @@ module CodeOcean # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. config.time_zone = 'Berlin' + + config.log_level = :warn # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]