Merge branch 'master' into fix_project_access_notification

2012-09-07 09:39:34 +03:00 · 2012-09-07 09:39:34 +03:00 · ed4fbcf6b0
parent 38b17e4e06 5cb9e7eedc
commit ed4fbcf6b0
953 changed files with 943 additions and 1041 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,4 +22,4 @@ config/unicorn.rb
 db/data.yml
 .idea
 .DS_Store
-
+.chef
--- a/.travis.yml
+++ b/.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"
--- a/Gemfile.lock
+++ b/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)
--- a/app/assets/images/emoji/+1.png
+++ b/app/assets/images/emoji/+1.png
--- a/app/assets/images/emoji/-1.png
+++ b/app/assets/images/emoji/-1.png
--- a/app/assets/images/emoji/100.png
+++ b/app/assets/images/emoji/100.png
--- a/app/assets/images/emoji/109.png
+++ b/app/assets/images/emoji/109.png
--- a/app/assets/images/emoji/1234.png
+++ b/app/assets/images/emoji/1234.png
--- a/app/assets/images/emoji/8ball.png
+++ b/app/assets/images/emoji/8ball.png
--- a/app/assets/images/emoji/a.png
+++ b/app/assets/images/emoji/a.png
--- a/app/assets/images/emoji/ab.png
+++ b/app/assets/images/emoji/ab.png
--- a/app/assets/images/emoji/abc.png
+++ b/app/assets/images/emoji/abc.png
--- a/app/assets/images/emoji/abcd.png
+++ b/app/assets/images/emoji/abcd.png
--- a/app/assets/images/emoji/accept.png
+++ b/app/assets/images/emoji/accept.png
--- a/app/assets/images/emoji/aerial_tramway.png
+++ b/app/assets/images/emoji/aerial_tramway.png
--- a/app/assets/images/emoji/airplane.png
+++ b/app/assets/images/emoji/airplane.png
--- a/app/assets/images/emoji/alarm_clock.png
+++ b/app/assets/images/emoji/alarm_clock.png
--- a/app/assets/images/emoji/alien.png
+++ b/app/assets/images/emoji/alien.png
--- a/app/assets/images/emoji/ambulance.png
+++ b/app/assets/images/emoji/ambulance.png
--- a/app/assets/images/emoji/anchor.png
+++ b/app/assets/images/emoji/anchor.png
--- a/app/assets/images/emoji/angel.png
+++ b/app/assets/images/emoji/angel.png
--- a/app/assets/images/emoji/anger.png
+++ b/app/assets/images/emoji/anger.png
--- a/app/assets/images/emoji/angry.png
+++ b/app/assets/images/emoji/angry.png
--- a/app/assets/images/emoji/ant.png
+++ b/app/assets/images/emoji/ant.png
--- a/app/assets/images/emoji/apple.png
+++ b/app/assets/images/emoji/apple.png
--- a/app/assets/images/emoji/aquarius.png
+++ b/app/assets/images/emoji/aquarius.png
--- a/app/assets/images/emoji/aries.png
+++ b/app/assets/images/emoji/aries.png
--- a/app/assets/images/emoji/arrow_backward.png
+++ b/app/assets/images/emoji/arrow_backward.png
--- a/app/assets/images/emoji/arrow_double_down.png
+++ b/app/assets/images/emoji/arrow_double_down.png
--- a/app/assets/images/emoji/arrow_double_up.png
+++ b/app/assets/images/emoji/arrow_double_up.png
--- a/app/assets/images/emoji/arrow_down.png
+++ b/app/assets/images/emoji/arrow_down.png
--- a/app/assets/images/emoji/arrow_down_small.png
+++ b/app/assets/images/emoji/arrow_down_small.png
--- a/app/assets/images/emoji/arrow_forward.png
+++ b/app/assets/images/emoji/arrow_forward.png
--- a/app/assets/images/emoji/arrow_heading_down.png
+++ b/app/assets/images/emoji/arrow_heading_down.png
--- a/app/assets/images/emoji/arrow_heading_up.png
+++ b/app/assets/images/emoji/arrow_heading_up.png
--- a/app/assets/images/emoji/arrow_left.png
+++ b/app/assets/images/emoji/arrow_left.png
--- a/app/assets/images/emoji/arrow_lower_left.png
+++ b/app/assets/images/emoji/arrow_lower_left.png
--- a/app/assets/images/emoji/arrow_lower_right.png
+++ b/app/assets/images/emoji/arrow_lower_right.png
--- a/app/assets/images/emoji/arrow_right.png
+++ b/app/assets/images/emoji/arrow_right.png
--- a/app/assets/images/emoji/arrow_right_hook.png
+++ b/app/assets/images/emoji/arrow_right_hook.png
--- a/app/assets/images/emoji/arrow_up.png
+++ b/app/assets/images/emoji/arrow_up.png
--- a/app/assets/images/emoji/arrow_up_down.png
+++ b/app/assets/images/emoji/arrow_up_down.png
--- a/app/assets/images/emoji/arrow_up_small.png
+++ b/app/assets/images/emoji/arrow_up_small.png
--- a/app/assets/images/emoji/arrow_upper_left.png
+++ b/app/assets/images/emoji/arrow_upper_left.png
--- a/app/assets/images/emoji/arrow_upper_right.png
+++ b/app/assets/images/emoji/arrow_upper_right.png
--- a/app/assets/images/emoji/arrows_clockwise.png
+++ b/app/assets/images/emoji/arrows_clockwise.png
--- a/app/assets/images/emoji/arrows_counterclockwise.png
+++ b/app/assets/images/emoji/arrows_counterclockwise.png
--- a/app/assets/images/emoji/art.png
+++ b/app/assets/images/emoji/art.png
--- a/app/assets/images/emoji/articulated_lorry.png
+++ b/app/assets/images/emoji/articulated_lorry.png
--- a/app/assets/images/emoji/astonished.png
+++ b/app/assets/images/emoji/astonished.png
--- a/app/assets/images/emoji/atm.png
+++ b/app/assets/images/emoji/atm.png
--- a/app/assets/images/emoji/b.png
+++ b/app/assets/images/emoji/b.png
--- a/app/assets/images/emoji/baby.png
+++ b/app/assets/images/emoji/baby.png
--- a/app/assets/images/emoji/baby_bottle.png
+++ b/app/assets/images/emoji/baby_bottle.png
--- a/app/assets/images/emoji/baby_chick.png
+++ b/app/assets/images/emoji/baby_chick.png
--- a/app/assets/images/emoji/baby_symbol.png
+++ b/app/assets/images/emoji/baby_symbol.png
--- a/app/assets/images/emoji/baggage_claim.png
+++ b/app/assets/images/emoji/baggage_claim.png
--- a/app/assets/images/emoji/balloon.png
+++ b/app/assets/images/emoji/balloon.png
--- a/app/assets/images/emoji/ballot_box_with_check.png
+++ b/app/assets/images/emoji/ballot_box_with_check.png
--- a/app/assets/images/emoji/bamboo.png
+++ b/app/assets/images/emoji/bamboo.png
--- a/app/assets/images/emoji/banana.png
+++ b/app/assets/images/emoji/banana.png
--- a/app/assets/images/emoji/bangbang.png
+++ b/app/assets/images/emoji/bangbang.png
--- a/app/assets/images/emoji/bank.png
+++ b/app/assets/images/emoji/bank.png
--- a/app/assets/images/emoji/bar_chart.png
+++ b/app/assets/images/emoji/bar_chart.png
--- a/app/assets/images/emoji/barber.png
+++ b/app/assets/images/emoji/barber.png
--- a/app/assets/images/emoji/baseball.png
+++ b/app/assets/images/emoji/baseball.png
--- a/app/assets/images/emoji/basketball.png
+++ b/app/assets/images/emoji/basketball.png
--- a/app/assets/images/emoji/bath.png
+++ b/app/assets/images/emoji/bath.png
--- a/app/assets/images/emoji/bathtub.png
+++ b/app/assets/images/emoji/bathtub.png
--- a/app/assets/images/emoji/battery.png
+++ b/app/assets/images/emoji/battery.png
--- a/app/assets/images/emoji/bear.png
+++ b/app/assets/images/emoji/bear.png
--- a/app/assets/images/emoji/beer.png
+++ b/app/assets/images/emoji/beer.png
--- a/app/assets/images/emoji/beers.png
+++ b/app/assets/images/emoji/beers.png
--- a/app/assets/images/emoji/beetle.png
+++ b/app/assets/images/emoji/beetle.png
--- a/app/assets/images/emoji/beginner.png
+++ b/app/assets/images/emoji/beginner.png
--- a/app/assets/images/emoji/bell.png
+++ b/app/assets/images/emoji/bell.png
--- a/app/assets/images/emoji/bento.png
+++ b/app/assets/images/emoji/bento.png
--- a/app/assets/images/emoji/bicyclist.png
+++ b/app/assets/images/emoji/bicyclist.png
--- a/app/assets/images/emoji/bike.png
+++ b/app/assets/images/emoji/bike.png
--- a/app/assets/images/emoji/bikini.png
+++ b/app/assets/images/emoji/bikini.png
--- a/app/assets/images/emoji/bird.png
+++ b/app/assets/images/emoji/bird.png
--- a/app/assets/images/emoji/birthday.png
+++ b/app/assets/images/emoji/birthday.png
--- a/app/assets/images/emoji/black_circle.png
+++ b/app/assets/images/emoji/black_circle.png
--- a/app/assets/images/emoji/black_joker.png
+++ b/app/assets/images/emoji/black_joker.png
--- a/app/assets/images/emoji/black_nib.png
+++ b/app/assets/images/emoji/black_nib.png
--- a/app/assets/images/emoji/black_square.png
+++ b/app/assets/images/emoji/black_square.png
--- a/app/assets/images/emoji/blossom.png
+++ b/app/assets/images/emoji/blossom.png
--- a/app/assets/images/emoji/blowfish.png
+++ b/app/assets/images/emoji/blowfish.png
--- a/app/assets/images/emoji/blue_book.png
+++ b/app/assets/images/emoji/blue_book.png
--- a/app/assets/images/emoji/blue_car.png
+++ b/app/assets/images/emoji/blue_car.png
--- a/app/assets/images/emoji/blue_heart.png
+++ b/app/assets/images/emoji/blue_heart.png
--- a/app/assets/images/emoji/blush.png
+++ b/app/assets/images/emoji/blush.png
--- a/app/assets/images/emoji/boar.png
+++ b/app/assets/images/emoji/boar.png
--- a/app/assets/images/emoji/boat.png
+++ b/app/assets/images/emoji/boat.png
--- a/app/assets/images/emoji/bomb.png
+++ b/app/assets/images/emoji/bomb.png
--- a/app/assets/images/emoji/book.png
+++ b/app/assets/images/emoji/book.png
--- a/app/assets/images/emoji/bookmark.png
+++ b/app/assets/images/emoji/bookmark.png
--- a/app/assets/images/emoji/bookmark_tabs.png
+++ b/app/assets/images/emoji/bookmark_tabs.png
--- a/app/assets/images/emoji/books.png
+++ b/app/assets/images/emoji/books.png
--- a/app/assets/images/emoji/boot.png
+++ b/app/assets/images/emoji/boot.png
--- a/Show more
+++ b/Show more