Merge branch 'master' into fix_project_access_notification

.gitignore

@@ -22,4 +22,4 @@ config/unicorn.rb
 db/data.yml
 .idea
 .DS_Store
-
+.chef

.travis.yml

@@ -9,6 +9,8 @@ branches:
     - 'master'
 rvm:
   - 1.9.3
+services:
+  - mysql
 before_script:
   - "cp config/database.yml.$DB config/database.yml"
   - "cp config/gitlab.yml.example config/gitlab.yml"

Gemfile.lock

@@ -323,7 +323,7 @@ GEM
       multi_json (~> 1.0)
       rubyzip
     settingslogic (2.0.8)
-    shoulda-matchers (1.1.0)
+    shoulda-matchers (1.3.0)
       activesupport (>= 3.0.0)
     simplecov (0.6.4)
       multi_json (~> 1.0)