Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
a411b7de90ee
Commit
292ab83c
authored
Apr 25, 2018
by
Bob Van Landuyt
Browse files
Add model to track users accepting agreements
parent
a95259f3a366
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/models/term_agreement.rb
0 → 100644
View file @
a411b7de
class
TermAgreement
<
ActiveRecord
::
Base
belongs_to
:term
,
class_name:
'ApplicationSetting::Term'
belongs_to
:user
validates
:user
,
:term
,
presence:
true
end
db/migrate/20180425075446_create_term_agreements.rb
0 → 100644
View file @
a411b7de
class
CreateTermAgreements
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
disable_ddl_transaction!
def
up
create_table
:term_agreements
do
|
t
|
t
.
references
:term
,
index:
true
,
null:
false
t
.
foreign_key
:application_setting_terms
,
column: :term_id
t
.
references
:user
,
index:
true
,
null:
false
,
foreign_key:
{
on_delete: :cascade
}
t
.
boolean
:accepted
,
default:
false
,
null:
false
t
.
timestamps_with_timezone
null:
false
end
add_index
:term_agreements
,
[
:user_id
,
:term_id
],
unique:
true
,
name:
'term_agreements_unique_index'
end
def
down
remove_index
:term_agreements
,
name:
'term_agreements_unique_index'
drop_table
:term_agreements
end
end
db/schema.rb
View file @
a411b7de
...
...
@@ -1824,6 +1824,18 @@
add_index
"tags"
,
[
"name"
],
name:
"index_tags_on_name"
,
unique:
true
,
using: :btree
create_table
"term_agreements"
,
force: :cascade
do
|
t
|
t
.
integer
"term_id"
,
null:
false
t
.
integer
"user_id"
,
null:
false
t
.
boolean
"accepted"
,
default:
false
,
null:
false
t
.
datetime_with_timezone
"created_at"
,
null:
false
t
.
datetime_with_timezone
"updated_at"
,
null:
false
end
add_index
"term_agreements"
,
[
"term_id"
],
name:
"index_term_agreements_on_term_id"
,
using: :btree
add_index
"term_agreements"
,
[
"user_id"
,
"term_id"
],
name:
"term_agreements_unique_index"
,
unique:
true
,
using: :btree
add_index
"term_agreements"
,
[
"user_id"
],
name:
"index_term_agreements_on_user_id"
,
using: :btree
create_table
"timelogs"
,
force: :cascade
do
|
t
|
t
.
integer
"time_spent"
,
null:
false
t
.
integer
"user_id"
...
...
@@ -2212,6 +2224,8 @@
add_foreign_key
"snippets"
,
"projects"
,
name:
"fk_be41fd4bb7"
,
on_delete: :cascade
add_foreign_key
"subscriptions"
,
"projects"
,
on_delete: :cascade
add_foreign_key
"system_note_metadata"
,
"notes"
,
name:
"fk_d83a918cb1"
,
on_delete: :cascade
add_foreign_key
"term_agreements"
,
"application_setting_terms"
,
column:
"term_id"
add_foreign_key
"term_agreements"
,
"users"
,
on_delete: :cascade
add_foreign_key
"timelogs"
,
"issues"
,
name:
"fk_timelogs_issues_issue_id"
,
on_delete: :cascade
add_foreign_key
"timelogs"
,
"merge_requests"
,
name:
"fk_timelogs_merge_requests_merge_request_id"
,
on_delete: :cascade
add_foreign_key
"todos"
,
"notes"
,
name:
"fk_91d1f47b13"
,
on_delete: :cascade
...
...
spec/models/term_agreement_spec.rb
0 → 100644
View file @
a411b7de
require
'spec_helper'
describe
TermAgreement
do
describe
'validations'
do
it
{
is_expected
.
to
validate_presence_of
(
:term
)
}
it
{
is_expected
.
to
validate_presence_of
(
:user
)
}
end
end
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