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
Jérome Perrin
gitlab-ce
Commits
781efd18
Commit
781efd18
authored
Jun 04, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'broadcast-3-digit-colors' into 'master'
Broadcast 3 digit colors
parents
5921c748
74bcc832
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/models/broadcast_message.rb
app/models/broadcast_message.rb
+2
-2
No files found.
app/models/broadcast_message.rb
View file @
781efd18
...
@@ -20,8 +20,8 @@ class BroadcastMessage < ActiveRecord::Base
...
@@ -20,8 +20,8 @@ class BroadcastMessage < ActiveRecord::Base
validates
:starts_at
,
presence:
true
validates
:starts_at
,
presence:
true
validates
:ends_at
,
presence:
true
validates
:ends_at
,
presence:
true
validates
:color
,
format:
{
with:
/\A\#[0-9A-Fa-f]{
6
}+\Z/
},
allow_blank:
true
validates
:color
,
format:
{
with:
/\A\#[0-9A-Fa-f]{
3}{1,2
}+\Z/
},
allow_blank:
true
validates
:font
,
format:
{
with:
/\A\#[0-9A-Fa-f]{
6
}+\Z/
},
allow_blank:
true
validates
:font
,
format:
{
with:
/\A\#[0-9A-Fa-f]{
3}{1,2
}+\Z/
},
allow_blank:
true
def
self
.
current
def
self
.
current
where
(
"ends_at > :now AND starts_at < :now"
,
now:
Time
.
zone
.
now
).
last
where
(
"ends_at > :now AND starts_at < :now"
,
now:
Time
.
zone
.
now
).
last
...
...
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