Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
wattsworth
/
lumen-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
627fde04
authored
Jul 06, 2018
by
John Doe
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
updated devise user model and migrated to new platform defaults
parent
3874d609
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
8 deletions
app/adapters/joule_adapter.rb
app/services/data/load_stream_data.rb
config/initializers/new_framework_defaults.rb
db/migrate/20180620021012_add_user_password_reset_column.rb
db/schema.rb
app/adapters/joule_adapter.rb
View file @
627fde04
...
...
@@ -32,6 +32,6 @@ class JouleAdapter
end
def
module_interface
(
joule_module
,
req
)
self
.
class
.
get
(
"
#{
@url
}
/
modul
e/
#{
joule_module
.
joule_id
}
/
#{
req
}
"
)
self
.
class
.
get
(
"
#{
@url
}
/
interfac
e/
#{
joule_module
.
joule_id
}
/
#{
req
}
"
)
end
end
app/services/data/load_stream_data.rb
View file @
627fde04
...
...
@@ -33,7 +33,7 @@ class LoadStreamData
#
# data_type: interval
# data:
# [{id: element_id, type:
decimated
, values: [[start,0],[end,0],nil,...]}]
# [{id: element_id, type:
interval
, values: [[start,0],[end,0],nil,...]}]
#
def
run
(
db_stream
,
start_time
,
end_time
,
elements
=
[],
resolution
=
nil
)
...
...
config/initializers/new_framework_defaults.rb
View file @
627fde04
...
...
@@ -7,17 +7,16 @@
# Read the Guide for Upgrading Ruby on Rails for more info on each option.
# Enable per-form CSRF tokens. Previous versions had false.
#
Rails.application.config.action_controller.per_form_csrf_tokens = false
Rails
.
application
.
config
.
action_controller
.
per_form_csrf_tokens
=
false
# Enable origin-checking CSRF mitigation. Previous versions had false.
#
Rails.application.config.action_controller.forgery_protection_origin_check = false
Rails
.
application
.
config
.
action_controller
.
forgery_protection_origin_check
=
false
# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
# Previous versions had false.
#
ActiveSupport.to_time_preserves_timezone = false
ActiveSupport
.
to_time_preserves_timezone
=
false
# Require `belongs_to` associations by default. Previous versions had false.
Rails
.
application
.
config
.
active_record
.
belongs_to_required_by_default
=
false
# Do not halt callback chains when a callback returns false. Previous versions had true.
# ActiveSupport.halt_callback_chains_on_return_false = false
Rails
.
application
.
config
.
active_record
.
sqlite3
.
represent_boolean_as_integer
=
true
db/migrate/20180620021012_add_user_password_reset_column.rb
0 → 100644
View file @
627fde04
class
AddUserPasswordResetColumn
<
ActiveRecord
::
Migration
[
5.2
]
def
change
add_column
:users
,
:allow_password_change
,
:boolean
,
default:
false
,
null:
false
end
end
db/schema.rb
View file @
627fde04
...
...
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
2018
0505193715
)
do
ActiveRecord
::
Schema
.
define
(
version:
2018
_06_20_021012
)
do
create_table
"data_views"
,
force: :cascade
do
|
t
|
t
.
integer
"user_id"
...
...
@@ -205,6 +205,7 @@ ActiveRecord::Schema.define(version: 20180505193715) do
t
.
string
"invited_by_type"
t
.
string
"invitation_url"
t
.
integer
"home_data_view_id"
t
.
boolean
"allow_password_change"
,
default:
false
,
null:
false
t
.
index
[
"confirmation_token"
],
name:
"index_users_on_confirmation_token"
,
unique:
true
t
.
index
[
"email"
],
name:
"index_users_on_email"
,
unique:
true
t
.
index
[
"invitation_token"
],
name:
"index_users_on_invitation_token"
,
unique:
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment