Resolved issue #235
This commit is contained in:
parent
15016ae68d
commit
91d5a906f9
4 changed files with 63 additions and 3 deletions
56
.rvmrc
56
.rvmrc
|
@ -1 +1,55 @@
|
|||
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
|
||||
|
||||
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -12,7 +12,12 @@ 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
|
||||
@p1 = Factory :project
|
||||
|
|
Loading…
Reference in a new issue