Merge branch 'master' of dev.gitlabhq.com:gitlabhq

6 files changed, 65 insertions, 5 deletions

diff --git a/.rvmrc b/.rvmrc
index 8ad3b66d530..8af363c4c1f 100644
--- a/.rvmrc
+++ b/.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
+
+
diff --git a/app/models/note.rb b/app/models/note.rb
index 0ec63f8b6a2..946f506264a 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -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")
diff --git a/app/models/user.rb b/app/models/user.rb
index f6c271467dd..712c7aecb26 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -30,7 +30,7 @@ class User < ActiveRecord::Base
   scope :not_in_project, lambda { |project|  where("id not in (:ids)", :ids => project.users.map(&:id) ) }
 
   def identifier
-    email.gsub "@", "_"
+    email.gsub /[@.]/, "_"
   end
 
   def is_admin?
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 6407da10403..b06e75ef698 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -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
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 038e4f9d36e..bd3f3934aec 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -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
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a22aee75b0d..226365775da 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -16,7 +16,7 @@ describe User do
 
   it "should return valid identifier" do
     user = User.new(:email => "test@mail.com")
-    user.identifier.should == "test_mail.com"
+    user.identifier.should == "test_mail_com"
   end
 
   it "should have authentication token" do