diff --git a/app/models/user.rb b/app/models/user.rb index 332ce74..e5fcf2d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -13,6 +13,7 @@ class User ENCRYPTED_PASSWORD_FILE = Rails.root + "db/#{Rails.env}-user.txt" attr_accessor :name, :password, :password_confirmation, :current_password + attr_writer :password_digest validates :name, presence: true validates :password, length: { minimum: 8 } @@ -28,10 +29,6 @@ class User end end - def password_digest=(digest) - @password_digest = digest - end - def update_attributes(params) params.each_pair do |key, value| send("#{key}=", value) diff --git a/app/views/fluentd/settings/in_syslog/_form.html.haml b/app/views/fluentd/settings/in_syslog/_form.html.haml index 7b84c63..0a13165 100644 --- a/app/views/fluentd/settings/in_syslog/_form.html.haml +++ b/app/views/fluentd/settings/in_syslog/_form.html.haml @@ -5,5 +5,5 @@ = field(f, :bind) = field(f, :port) = field(f, :types) - = f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary pull-right" + = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary pull-right" diff --git a/app/views/fluentd/settings/out_forward/_form.html.haml b/app/views/fluentd/settings/out_forward/_form.html.haml index 7cbce73..1c584a2 100644 --- a/app/views/fluentd/settings/out_forward/_form.html.haml +++ b/app/views/fluentd/settings/out_forward/_form.html.haml @@ -17,6 +17,6 @@ = field(f, :heartbeat_interval) = field(f, :phi_threshold) = field(f, :hard_timeout) - = f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary pull-right" + = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary pull-right" diff --git a/app/views/fluentd/settings/out_mongo/_form.html.haml b/app/views/fluentd/settings/out_mongo/_form.html.haml index 22c30f5..4d5f3e4 100644 --- a/app/views/fluentd/settings/out_mongo/_form.html.haml +++ b/app/views/fluentd/settings/out_mongo/_form.html.haml @@ -26,5 +26,5 @@ = field(f, :retry_limit) = field(f, :max_retry_wait) = field(f, :num_threads) - = f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary pull-right" + = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary pull-right" diff --git a/app/views/fluentd/settings/out_s3/_form.html.haml b/app/views/fluentd/settings/out_s3/_form.html.haml index d1b025f..51e9b40 100644 --- a/app/views/fluentd/settings/out_s3/_form.html.haml +++ b/app/views/fluentd/settings/out_s3/_form.html.haml @@ -34,6 +34,6 @@ = field(f, :retry_limit) = field(f, :max_retry_wait) = field(f, :num_threads) - = f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary pull-right" + = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary pull-right" diff --git a/app/views/fluentd/settings/out_td/_form.html.haml b/app/views/fluentd/settings/out_td/_form.html.haml index c41dfde..ae04120 100644 --- a/app/views/fluentd/settings/out_td/_form.html.haml +++ b/app/views/fluentd/settings/out_td/_form.html.haml @@ -15,4 +15,4 @@ = field(f, :flush_interval) = field(f, :buffer_type) = field(f, :buffer_path) - = f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary pull-right" + = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary pull-right" diff --git a/app/views/shared/vue/_fluent_log.html.erb b/app/views/shared/vue/_fluent_log.html.erb index a9f615a..65ceda2 100644 --- a/app/views/shared/vue/_fluent_log.html.erb +++ b/app/views/shared/vue/_fluent_log.html.erb @@ -2,20 +2,21 @@ <% auto_reload ||= true %>
">

- - - <%= t('terms.lines') %> - - <%= icon('fa-spin fa-refresh') %> -

+ + + <%= t('terms.lines') %> + + <%= icon('fa-spin fa-refresh') %> +


 
{{ $value }}
+

[log is empty]

diff --git a/app/views/tutorials/chapter1.html.erb b/app/views/tutorials/chapter1.html.erb index 5cd92ed..9aa0d40 100644 --- a/app/views/tutorials/chapter1.html.erb +++ b/app/views/tutorials/chapter1.html.erb @@ -7,7 +7,7 @@

-<%= t ".description" %> + <%= t ".description" %>