Merge pull request #982 from omu/fix-ci-error

CI'daki hataları düzelt
omu · Aug 27, 2019 · 35320e9 · 35320e9
2 parents f8b17e3 + bf0ea29
commit 35320e9
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -39,7 +39,11 @@ gem 'net-ldap'
 # assets: core asset dependencies
 # TODO: Edge versions require coffee-rails https://github.com/rails/rails/issues/28965
 gem 'coffee-rails', '~> 5.0'
+
+# TODO: The following line should be removed when sassc-rails has the latest version of sassc.
+gem 'sassc', '~> 2.2.0'
 gem 'sassc-rails'
+
 gem 'uglifier', '>= 1.3.0'
 gem 'webpacker'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -321,7 +321,7 @@ GEM
     ruby_dep (1.5.0)
     rubyzip (1.2.3)
     safe_yaml (1.0.5)
-    sassc (2.1.0)
+    sassc (2.2.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
@@ -462,6 +462,7 @@ DEPENDENCIES
   rubocop-rails
   ruby-progressbar
   ruby-vips (~> 2.0.14)
+  sassc (~> 2.2.0)
   sassc-rails
   sidekiq
   simple_form

diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -49,7 +49,4 @@
 
   # Raises error for missing translations
   config.action_view.raise_on_missing_translations = true
-
-  # Prevent expensive template finalization at end of test suite runs.
-  config.action_view.finalize_compiled_template_methods = false
 end
diff --git a/lib/tasks/fetch/academic_staff.rake b/lib/tasks/fetch/academic_staff.rake
@@ -51,10 +51,10 @@ namespace :fetch do
           password_confirmation: password
         )
 
-        next unless user.save
-
         progress_bar&.increment
 
+        next unless user.save
+
         title = Title.find_by(name: staff[:title].capitalize_turkish)
         unit = Unit.find_by(yoksis_id: staff[:unit_id])
 

diff --git a/plugins/support/lib/nokul/support/codification/codes.rb b/plugins/support/lib/nokul/support/codification/codes.rb
@@ -21,7 +21,6 @@ module Codification
 
       codifications.each do |codification|
         name            = codification.to_s.demodulize.underscore
-
         plural_method   = name.pluralize
         singular_method = name.singularize
 

diff --git a/plugins/support/lib/nokul/support/collection.rb b/plugins/support/lib/nokul/support/collection.rb
@@ -55,8 +55,8 @@ def self.to_yaml_pretty(instance)
 
       def self.write_to_yaml_file(file, instance, **options)
         comment = options[:comment]
-        yaml  = comment ? comment.gsub(/^/m, '# ') : ''
-        yaml += to_yaml_pretty(instance)
+        yaml    = comment ? comment.gsub(/^/m, '# ') : ''
+        yaml   += to_yaml_pretty(instance)
         Support.with_status_and_notification(file, **options) { File.write file, yaml }
       end
 

diff --git a/plugins/support/lib/nokul/support/minitest/validation_helper.rb b/plugins/support/lib/nokul/support/minitest/validation_helper.rb
@@ -45,6 +45,7 @@ def validates_length_of(attribute, **option)
             minimum: { value: -1, error_key: :too_short },
             maximum: { value: 1, error_key: :too_long }
           }
+
           key       = option.keys.first
           value     = option[key].to_i + controls.dig(key, :value).to_i
           error_key = controls.dig(key, :error_key)

diff --git a/plugins/tenant/omu/test/dummy/config/credentials.yml.enc b/plugins/tenant/omu/test/dummy/config/credentials.yml.enc
@@ -1 +1 @@
-F9GaVOZYaO29atDYJhVRd7uXR6E91a9OsvFZPVDZpEr0CDe113C6AyK5Q2r7ND/bKW7+2U7vXgA6/RT5Wx2OutuzCG+ag24x4yVmW5CNswY+IOccS13Wn21Rl3M5hctVDLkGTg4uqxCe9D16fMXjgzte8n03qv+I8YHItjHNkPVWQMZAsvdeYQ4GkzwwlJeUz2f2rdILzTYgiFAD3fOmhdkMN9YaVk1mygftFiKlii1hX8sixgOLmWp9jLrEZW11hzbbCt0YXrrH5krzW2f212jyX/7wUyAHKlCg3whjtcIJADh7NfoBKUFSBPk9oTOIUZqk6FDTPvEP/hpZjzinKbDuzLWrKLnTYscBAMpqYdxAmRWtnNZwJXCCBuowreo/bbjmzO5zJ8kEv0HBCjjcEsZVw4N9JUzHgc8MW+4RBzwzOpLz5UQRYVk/MulaOTZCmSGROEjRF/MSiW+hrexbMWMoPyeGnUfQ31MO2XBxgBSO3dS4QoV9QWEj1HWiFxGNnVWrZkY2j/asRCW/tA3gS48z/WO4wwc7McbZICK+MmUbuK1Gm7feWBJsIPKUNizrkbcqIPqhhMBPqTOcOpoZqFyyEaZsjTbQzyBZabVrREVO+hdJBK4vNMNfyk0bWlKtl6+8iDaCNb5QyPIEThLxeG2GTKL0jRJsaTV7AKhqm4493pw7ct3RM1LjC6EZk1oYG5rFS826rzvSSqRhX0ajk96Hjp+mZFYo1ZPq0HuyFhXPawcYJ1sieFnZwYMWuy03yeekjdHfj1wWA/1NVV9tJqrjRNEoTx875VkdUxf8GjDSk5BTZM9b7rKHVJ84UFYgeejfZcYyn1H29nHnnPHkoOd3gVmjncDUvJ5IPtMHhv7kvLbnrMqltnTQ0oQbvgk9O6uwWo+mOqe3ceZO87/mbf/KP/7pZDih2R6KpS1b44GHHIzIYK6DKP9ynQsIKdrLSYLQfznbjuGCyY+SMPN/eibp8hZFNK95KmhXltnrKKIVwLX5tC0UPvkoWW9udBLazwLNQBE8pXdK+11/O3Ol7jyf4QTX9BcuN5QVXhq7OPL7NGCOz2b+gkQGVpIJAlE=--WP1KJ6CvuIZ5szdy--L8NsdpbQnQWBUCE4f5DRCQ==
+rOEbk4oF+8RYUuXco0RMCJLLIz01OXOk7R07Z8icTy93ayLAjT6gAOJIPStcnIyoeAxgcfjkCc7npcf25CTR//AnKkTb0xuiFn0drI/vPOz/4yB2gHL/fElDvWJnSrr65+RhMe0QJFnwuE/sD9E0zNzoxs5wHGa+2kueDOy0PHlFh4CatbUiCr2XNn/tZFjqimk62Ko9F4wdjB+On6Adm4aZ9PAtEUsp04273Ft29GxOMH0osSmRkwk50rOUe2k934iahjJ4ea8R5cEjks5SFBEnf747d+jH4rFDfgTLA2DFo9ia2Dwul1FZqq4nw6O2crftknnAEqVQQKarQuYxvvivMCuRscMirROb2AIWU2ONaMt3UJ68IVVPQMYiOeIrAxuilLgKdgqcomB4hwJQqfKtowAIhcqua3MUSaRJipp7tfy8MZwW2WWDCIFiBmGyfyZhgpxLjl3f+Ava+60dR/ONpMJ6QJBJtxZULyFMgyI2xQZB8+hbcwGKuii0OQ9BbIzVRkLXIGF9m2Napmncv2clSjFD5UI9m0bl5QImYrWxgnQfExC8Vpy9Y3CWdeqiBQPhpQmpMEVSTklEcuvl0NVxzRoPm3S6k5CLOhNL4QL7i7kXVAG2WL8PNyjHrhL+pdMlxFeWgVNaBS2NBqvpceYhTya9lkxebYyT/q8KQaQPr9/1b5fUr3Eli9wVoewvCchTNyBsqYZhFwJ31vceDOQD5wU5AqkrE+aCv1Bc3v4OD40zsevzdM5grpQ0V7pWFJvLLHcdWspiQJIvLkmgI5j1H4v1BPVjS2OaFfm6CmLPs1Cf/m01mKX2nZi9wyJg75pvgDaM5ltr8s2jst0dBS/JK+7Odz6j+rDZa+9Fx5RETMzhK/XfPJyKTO9NRrtCSi4Zqcr0t0ApWnbqbQEm/8ooy4PBH44MKRfiZ662uuB2W6dpUxnE/EzgnKHFYcMJlNTTwYYHQ1ZoXchRzcDx34PUoLwqsxQ0mJgVuQo3QL2/lq4viyiVDkWd0ImWQ+Gp6Pmofsdfg0gxgcRq4Jbzp3BPrwP6as0OycsVRJP7cSfaXWjVPVYGzYGuj/SEHPI=--RdtbSSOgzTQu0+CR--xXYJPEYW+1Xhqdr2IdZtyA==
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		F9GaVOZYaO29atDYJhVRd7uXR6E91a9OsvFZPVDZpEr0CDe113C6AyK5Q2r7ND/bKW7+2U7vXgA6/RT5Wx2OutuzCG+ag24x4yVmW5CNswY+IOccS13Wn21Rl3M5hctVDLkGTg4uqxCe9D16fMXjgzte8n03qv+I8YHItjHNkPVWQMZAsvdeYQ4GkzwwlJeUz2f2rdILzTYgiFAD3fOmhdkMN9YaVk1mygftFiKlii1hX8sixgOLmWp9jLrEZW11hzbbCt0YXrrH5krzW2f212jyX/7wUyAHKlCg3whjtcIJADh7NfoBKUFSBPk9oTOIUZqk6FDTPvEP/hpZjzinKbDuzLWrKLnTYscBAMpqYdxAmRWtnNZwJXCCBuowreo/bbjmzO5zJ8kEv0HBCjjcEsZVw4N9JUzHgc8MW+4RBzwzOpLz5UQRYVk/MulaOTZCmSGROEjRF/MSiW+hrexbMWMoPyeGnUfQ31MO2XBxgBSO3dS4QoV9QWEj1HWiFxGNnVWrZkY2j/asRCW/tA3gS48z/WO4wwc7McbZICK+MmUbuK1Gm7feWBJsIPKUNizrkbcqIPqhhMBPqTOcOpoZqFyyEaZsjTbQzyBZabVrREVO+hdJBK4vNMNfyk0bWlKtl6+8iDaCNb5QyPIEThLxeG2GTKL0jRJsaTV7AKhqm4493pw7ct3RM1LjC6EZk1oYG5rFS826rzvSSqRhX0ajk96Hjp+mZFYo1ZPq0HuyFhXPawcYJ1sieFnZwYMWuy03yeekjdHfj1wWA/1NVV9tJqrjRNEoTx875VkdUxf8GjDSk5BTZM9b7rKHVJ84UFYgeejfZcYyn1H29nHnnPHkoOd3gVmjncDUvJ5IPtMHhv7kvLbnrMqltnTQ0oQbvgk9O6uwWo+mOqe3ceZO87/mbf/KP/7pZDih2R6KpS1b44GHHIzIYK6DKP9ynQsIKdrLSYLQfznbjuGCyY+SMPN/eibp8hZFNK95KmhXltnrKKIVwLX5tC0UPvkoWW9udBLazwLNQBE8pXdK+11/O3Ol7jyf4QTX9BcuN5QVXhq7OPL7NGCOz2b+gkQGVpIJAlE=--WP1KJ6CvuIZ5szdy--L8NsdpbQnQWBUCE4f5DRCQ==
		rOEbk4oF+8RYUuXco0RMCJLLIz01OXOk7R07Z8icTy93ayLAjT6gAOJIPStcnIyoeAxgcfjkCc7npcf25CTR//AnKkTb0xuiFn0drI/vPOz/4yB2gHL/fElDvWJnSrr65+RhMe0QJFnwuE/sD9E0zNzoxs5wHGa+2kueDOy0PHlFh4CatbUiCr2XNn/tZFjqimk62Ko9F4wdjB+On6Adm4aZ9PAtEUsp04273Ft29GxOMH0osSmRkwk50rOUe2k934iahjJ4ea8R5cEjks5SFBEnf747d+jH4rFDfgTLA2DFo9ia2Dwul1FZqq4nw6O2crftknnAEqVQQKarQuYxvvivMCuRscMirROb2AIWU2ONaMt3UJ68IVVPQMYiOeIrAxuilLgKdgqcomB4hwJQqfKtowAIhcqua3MUSaRJipp7tfy8MZwW2WWDCIFiBmGyfyZhgpxLjl3f+Ava+60dR/ONpMJ6QJBJtxZULyFMgyI2xQZB8+hbcwGKuii0OQ9BbIzVRkLXIGF9m2Napmncv2clSjFD5UI9m0bl5QImYrWxgnQfExC8Vpy9Y3CWdeqiBQPhpQmpMEVSTklEcuvl0NVxzRoPm3S6k5CLOhNL4QL7i7kXVAG2WL8PNyjHrhL+pdMlxFeWgVNaBS2NBqvpceYhTya9lkxebYyT/q8KQaQPr9/1b5fUr3Eli9wVoewvCchTNyBsqYZhFwJ31vceDOQD5wU5AqkrE+aCv1Bc3v4OD40zsevzdM5grpQ0V7pWFJvLLHcdWspiQJIvLkmgI5j1H4v1BPVjS2OaFfm6CmLPs1Cf/m01mKX2nZi9wyJg75pvgDaM5ltr8s2jst0dBS/JK+7Odz6j+rDZa+9Fx5RETMzhK/XfPJyKTO9NRrtCSi4Zqcr0t0ApWnbqbQEm/8ooy4PBH44MKRfiZ662uuB2W6dpUxnE/EzgnKHFYcMJlNTTwYYHQ1ZoXchRzcDx34PUoLwqsxQ0mJgVuQo3QL2/lq4viyiVDkWd0ImWQ+Gp6Pmofsdfg0gxgcRq4Jbzp3BPrwP6as0OycsVRJP7cSfaXWjVPVYGzYGuj/SEHPI=--RdtbSSOgzTQu0+CR--xXYJPEYW+1Xhqdr2IdZtyA==