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
Tatuya Kamada
gitlab-ce
Commits
91d5a906
Commit
91d5a906
authored
13 years ago
by
Drew
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolved issue #235
parent
15016ae6
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
3 deletions
+63
-3
.rvmrc
.rvmrc
+55
-1
app/models/note.rb
app/models/note.rb
+1
-0
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+1
-1
spec/models/note_spec.rb
spec/models/note_spec.rb
+6
-1
No files found.
.rvmrc
View file @
91d5a906
rvm use 1.9.2-p290
#!/usr/bin/env bash
# This is an RVM Project .rvmrc file, used to automatically load the ruby
# development environment upon cd'ing into the directory
# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
environment_id
=
"ruby-1.9.2-p290@gitlabhq"
#
# Uncomment following line if you want options to be set only for given project.
#
# PROJECT_JRUBY_OPTS=( --1.9 )
#
# First we attempt to load the desired environment directly from the environment
# file. This is very fast and efficient compared to running through the entire
# CLI and selector. If you want feedback on which environment was used then
# insert the word 'use' after --create as this triggers verbose mode.
#
if
[[
-d
"
${
rvm_path
:-
$HOME
/.rvm
}
/environments"
\
&&
-s
"
${
rvm_path
:-
$HOME
/.rvm
}
/environments/
$environment_id
"
]]
then
\.
"
${
rvm_path
:-
$HOME
/.rvm
}
/environments/
$environment_id
"
if
[[
-s
"
${
rvm_path
:-
$HOME
/.rvm
}
/hooks/after_use"
]]
then
.
"
${
rvm_path
:-
$HOME
/.rvm
}
/hooks/after_use"
fi
else
# If the environment file has not yet been created, use the RVM CLI to select.
if
!
rvm
--create
"
$environment_id
"
then
echo
"Failed to create RVM environment '
${
environment_id
}
'."
exit
1
fi
fi
#
# If you use an RVM gemset file to install a list of gems (*.gems), you can have
# it be automatically loaded. Uncomment the following and adjust the filename if
# necessary.
#
# filename=".gems"
# if [[ -s "$filename" ]]
# then
# rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
# fi
# If you use bundler, this might be useful to you:
# if command -v bundle && [[ -s Gemfile ]]
# then
# bundle
# fi
This diff is collapsed.
Click to expand it.
app/models/note.rb
View file @
91d5a906
...
...
@@ -27,6 +27,7 @@ class Note < ActiveRecord::Base
scope
:common
,
where
(
:noteable_id
=>
nil
)
scope
:today
,
where
(
"created_at >= :date"
,
:date
=>
Date
.
today
)
scope
:last_week
,
where
(
"created_at >= :date"
,
:date
=>
(
Date
.
today
-
7
.
days
))
scope
:since
,
lambda
{
|
day
|
where
(
"created_at >= :date"
,
:date
=>
(
day
))
}
scope
:fresh
,
order
(
"created_at DESC"
)
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/project.html.haml
View file @
91d5a906
...
...
@@ -38,7 +38,7 @@
=
link_to
wall_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"wall"
,
:id
=>
@project
)
?
"current"
:
nil
do
Wall
-
if
@project
.
common_notes
.
count
>
0
%span
{
:class
=>
"number"
}=
@project
.
common_notes
.
count
%span
{
:class
=>
"number"
}=
@project
.
common_notes
.
today
.
count
=
link_to
project_snippets_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"snippets"
)
?
"current"
:
nil
do
Snippets
-
if
@project
.
snippets
.
count
>
0
...
...
This diff is collapsed.
Click to expand it.
spec/models/note_spec.rb
View file @
91d5a906
...
...
@@ -12,6 +12,11 @@ describe Note do
it
{
Factory
.
create
(
:note
,
:project
=>
Factory
.
create
(
:project
)).
should
be_valid
}
describe
"Scopes"
do
it
"should have a today named scope that returns ..."
do
Note
.
today
.
where_values
.
should
==
[
"created_at >= '
#{
Date
.
today
}
'"
]
end
end
describe
:authorization
do
before
do
...
...
This diff is collapsed.
Click to expand it.
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