Merge branch 'sidebar_config' into ntu
Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/controllers/orbit_backend_controller.rb app/controllers/orbit_widget_controller.rb app/models/module_app.rb app/views/admin/page_parts/_module_widget.html.erb config/locales/zh_tw.yml lib/parsers/parser_common.rb lib/parsers/parser_front_end.rb
This commit is contained in:
commit
76296ab29b
160 files changed
+8659
-1037
No files matched your search
@@ -140,7 +140,7 @@ module OrbitCoreLib
|
||||
|
||||
protected
|
||||
def generate_token
|
||||
self.s_token = ActiveSupport::SecureRandom.hex(16)
|
||||
self.s_token = SecureRandom.hex(16)
|
||||
self.save!
|
||||
end
|
||||
end
|
||||
|
||||
Reference in new issue
Block a user