From 625ec68e5aed905dec12bb3cc0521ddee24e35e0 Mon Sep 17 00:00:00 2001
From: yqbk <jksyrek@gmail.com>
Date: Mon, 11 Jul 2016 15:28:34 +0200
Subject: [PATCH] change log_level

---
 app/assets/.DS_Store                     | Bin 6148 -> 0 bytes
 app/assets/javascripts/.DS_Store         | Bin 6148 -> 0 bytes
 app/views/exercises/_file_form.html.slim |   4 ++--
 config/application.rb                    |   2 ++
 4 files changed, 4 insertions(+), 2 deletions(-)
 delete mode 100644 app/assets/.DS_Store
 delete mode 100644 app/assets/javascripts/.DS_Store

diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store
deleted file mode 100644
index 29fe53759e99b0e6225cfa58801e096c0a08493d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}OId5U!3<C&^{R6@<O?bs>jD{5y_WJqm${vaAwkb_UWCW<q9?AR#bkA47N5
z$8g=J*caLJR(1CVC3+KCLe)_HRaaMa(_cf^GysUkAglwp0N|h!7E0K>AT&-oBL(Xb
zh^RP63g4g)3VM*uM6=_6WPr}D0vF)J5cTQ#rNJoe1>GdTh(AHEtJ17i`z;C!#l@v%
zr&O-c=dP5`TAgIn%KU7QHvIlq-BV!{Si9+GoqzUGl60rG9~`S_)OJ67PU6g0anyg3
zdU~SbFc~$HK^&&1Ei>PV3bRhzU2FEEA*MF{I679T3RG8RmrjX393780tFkt!%5i;T
zXS*u5ck7dh`_pkge%jhQ{L-6TUEh5FaeH_F@MsQ15C<fy2Bz(=sl^5}zzi@0^TmL@
z_ngXnZHsrq3@`(4zyRG35|z-im>bkr2R8Z%fLKJg7PRRtK{?W*XE8U3BPhb8BAQfT
zpBTcVqhH!M&th)Sq=V2a<2-g{VP7ahua17H!$Eikxn%~Jf#(b?n669p|KRoa|MMj7
zF$2uNTrnVu`>p*3ZpqfxnaxqHm8j>aBovn$oTi|mOEJb$DPBj_f__N`qGvHTh#nOF
O5zsVn!wkGD1AhV6j9;k$

diff --git a/app/assets/javascripts/.DS_Store b/app/assets/javascripts/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

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]