Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
6ae39c2c
Commit
6ae39c2c
authored
Dec 31, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove alert_type attribute from BroadcastMessage
parent
7e24c5c4
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
7 deletions
+12
-7
app/controllers/admin/broadcast_messages_controller.rb
app/controllers/admin/broadcast_messages_controller.rb
+7
-4
app/models/broadcast_message.rb
app/models/broadcast_message.rb
+0
-1
db/migrate/20151231202530_remove_alert_type_from_broadcast_messages.rb
...151231202530_remove_alert_type_from_broadcast_messages.rb
+5
-0
db/schema.rb
db/schema.rb
+0
-1
spec/models/broadcast_message_spec.rb
spec/models/broadcast_message_spec.rb
+0
-1
No files found.
app/controllers/admin/broadcast_messages_controller.rb
View file @
6ae39c2c
...
@@ -31,9 +31,12 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
...
@@ -31,9 +31,12 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
end
end
def
broadcast_message_params
def
broadcast_message_params
params
.
require
(
:broadcast_message
).
permit
(
params
.
require
(
:broadcast_message
).
permit
(
%i(
:alert_type
,
:color
,
:ends_at
,
:font
,
color
:message
,
:starts_at
ends_at
)
font
message
starts_at
)
)
end
end
end
end
app/models/broadcast_message.rb
View file @
6ae39c2c
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
# message :text not null
# message :text not null
# starts_at :datetime
# starts_at :datetime
# ends_at :datetime
# ends_at :datetime
# alert_type :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# color :string(255)
# color :string(255)
...
...
db/migrate/20151231202530_remove_alert_type_from_broadcast_messages.rb
0 → 100644
View file @
6ae39c2c
class
RemoveAlertTypeFromBroadcastMessages
<
ActiveRecord
::
Migration
def
change
remove_column
:broadcast_messages
,
:alert_type
,
:integer
end
end
db/schema.rb
View file @
6ae39c2c
...
@@ -82,7 +82,6 @@ ActiveRecord::Schema.define(version: 20160113111034) do
...
@@ -82,7 +82,6 @@ ActiveRecord::Schema.define(version: 20160113111034) do
t
.
text
"message"
,
null:
false
t
.
text
"message"
,
null:
false
t
.
datetime
"starts_at"
t
.
datetime
"starts_at"
t
.
datetime
"ends_at"
t
.
datetime
"ends_at"
t
.
integer
"alert_type"
t
.
datetime
"created_at"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"updated_at"
t
.
string
"color"
t
.
string
"color"
...
...
spec/models/broadcast_message_spec.rb
View file @
6ae39c2c
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
# message :text not null
# message :text not null
# starts_at :datetime
# starts_at :datetime
# ends_at :datetime
# ends_at :datetime
# alert_type :integer
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# color :string(255)
# color :string(255)
...
...
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