Merge branch 'master' into 369-bootstrap

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/angular-new/models/build_list.js.erb
	app/assets/javascripts/extra/build_list.js
	app/controllers/projects/build_lists_controller.rb
	app/controllers/projects/projects_controller.rb
	app/models/platform.rb
	app/views/projects/base/_layout.html.haml
	app/views/projects/build_lists/_new_form.html.haml
	app/views/projects/build_lists/show.html.haml
	app/views/projects/git/base/_fork.html.haml
	app/views/projects/git/commits/_commits.html.haml
	config/locales/en.yml
	config/locales/ru.yml

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.1.3
 bundler_args: --without development
 env:
   - SPEC_GROUP=controllers

Gemfile

@@ -1,14 +1,14 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.0.5'
+gem 'rails', '4.0.9'
 
 gem 'activeadmin', github: 'gregbell/active_admin'
 gem 'pg', '~> 0.17.1'
-gem 'schema_plus', '~> 1.4.0'
+gem 'schema_plus', '~> 1.5'
 ########
 gem 'protected_attributes'
 ########
-gem 'devise', '~> 3.2.3'
+gem 'devise', '~> 3.3'
 gem 'omniauth'
 gem 'omniauth-facebook'
 gem 'omniauth-google-oauth2'
@@ -17,10 +17,10 @@ gem 'omniauth-github'
 # gem 'cancan', '1.6.10'
 gem 'cancan', git: 'git://github.com/rosa-abf/cancan.git', tag: '1.6.10-abf'
 
-gem 'ancestry', '~> 2.0.0'
+gem 'ancestry', '~> 2.1'
-gem 'paperclip', '~> 4.1.1'
+gem 'paperclip', '~> 4.2'
 gem 'resque', '~> 1.25'
-gem 'resque-status', '~> 0.4.2'
+gem 'resque-status', '~> 0.4'
 gem 'resque_mailer', '~> 2.2'
 gem 'resque-scheduler', '~> 2.5.4'
 gem 'perform_later', git: 'git://github.com/KensoDev/perform_later.git' # should be after resque_mailer
@@ -30,14 +30,14 @@ gem 'state_machine', '~> 1.2'
 gem 'redis-rails', '~> 4.0'
 
 gem 'grack', git: 'git://github.com/rosa-abf/grack.git', require: 'git_http'
-gem 'grit', git: 'git://github.com/rosa-abf/grit.git'
+gem 'grit', git: 'git://github.com/rosa-abf/grit.git', tag: '2.6.16'
-gem 'charlock_holmes', '~> 0.6.9'
+gem 'charlock_holmes', '~> 0.7'
-gem 'github-linguist', '~> 2.10', require: 'linguist'
+gem 'github-linguist', '~> 3.1', require: 'linguist'
 gem 'diff-display', '~> 0.0.1'
 
 # Wiki
-gem "gollum-lib", '~> 2.0'
+gem "gollum-lib", '~> 3.0'
-gem "redcarpet", '~> 3.1.1'
+gem "redcarpet", '~> 3.1'
 gem 'creole'
 gem 'rdiscount'
 # gem 'org-ruby'
@@ -47,25 +47,25 @@ gem 'wikicloth'
 gem 'newrelic_rpm'
 gem 'whenever', '~> 0.9.0', require: false
 
-gem 'jbuilder', '~> 2.0.3'
+gem 'jbuilder', '~> 2.1'
 gem 'rails3-jquery-autocomplete', '~> 1.0'
-gem 'will_paginate', '~> 3.0.5'
+gem 'will_paginate', '~> 3.0'
-gem 'meta-tags', '~> 1.5', require: 'meta_tags'
+gem 'meta-tags', '~> 2.0', require: 'meta_tags'
 gem "haml-rails", '~> 0.5'
-gem 'jquery-rails', '~> 2.3.0'
+gem 'jquery-rails', '~> 2.3'
 gem 'jquery-migrate-rails'
 gem 'ruby-haml-js', '~> 0.0.5'
-gem 'friendly_id', '~> 5.0.3'
+gem 'friendly_id', '~> 5.0'
 
 gem 'rack-throttle', '~> 0.3.0'
-gem 'rest-client', '~> 1.6.7'
+gem 'rest-client', '~> 1.7'
-gem 'ohm', '~> 1.3.2'
+gem 'ohm', '~> 1.3.2' # Ohm 2 breaks the compatibility with previous versions.
 gem 'ohm-expire', '~> 0.1.3'
 
 gem 'ffi', '~> 1.9.3'
 
-gem 'attr_encrypted', '~> 1.3.2'
+gem 'attr_encrypted', '~> 1.3'
-gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
+gem "gemoji", "~> 2.1"
 
 # AngularJS related stuff
 gem 'underscore-rails'
@@ -81,26 +81,24 @@ gem 'ngmin-rails'
 
 gem 'time_diff'
 
-gem 'sass-rails', '~> 4.0.1'
+gem 'sass-rails', '~> 4.0'
-gem 'coffee-rails', '~> 4.0.1'
+gem 'coffee-rails', '~> 4.1'
-gem 'compass-rails', '~> 1.1.6'
+gem 'bootstrap-sass', '~> 3.2'
+gem 'font-awesome-rails', '~> 4.2'
+gem 'zeroclipboard-rails', '~> 0.1.0'
+
+gem 'compass-rails', '~> 2.0'
 gem 'uglifier', '~> 2.5'
 gem 'therubyracer', '~> 0.12.1', platforms: [:mri, :rbx]
-gem 'therubyrhino', '~> 1.73.1', platforms: :jruby
+gem 'therubyrhino', '~> 2.0', platforms: :jruby
-
-gem 'bootstrap-sass', '~> 3.1.1'
-gem 'font-awesome-rails', '~> 4.1'
-gem 'codemirror-rails'
-
 gem 'sitemap_generator'
 
-gem 'zeroclipboard-rails'
+gem 'codemirror-rails', '~> 4.5'
+
 
 group :production do
-  gem "airbrake", '~> 3.1.2'
+  gem "airbrake", '~> 3.1'
-  gem 'bluepill', '~> 0.0.60', require: false
+  #gem 'bluepill', '~> 0.0.60', require: false
-  # gem 'le'
-  gem 'logglier'
   gem 'puma'
 end
 
@@ -133,6 +131,7 @@ group :test do
   gem 'shoulda'
   gem 'shoulda-matchers'
   gem 'mock_redis',         '~> 0.11'
+  gem 'webmock'
   gem 'rake'
   gem 'test_after_commit'
   gem 'timecop'

Gemfile.lock

@@ -10,19 +10,18 @@ GIT
 
 GIT
   remote: git://github.com/gregbell/active_admin.git
-  revision: 5ac883c59978799829a8c085fab47f858574c42f
+  revision: 5e9917a5c85d0697114ce9f6166da48595c4d1ba
   specs:
     activeadmin (1.0.0.pre)
-      arbre (~> 1.0)
+      arbre (~> 1.0, >= 1.0.2)
       bourbon
       coffee-rails
-      devise (~> 3.2)
+      formtastic (~> 2.3.0.rc3)
-      formtastic (~> 2.3.0.rc2)
+      inherited_resources (~> 1.4.1)
-      inherited_resources (~> 1.3)
       jquery-rails
-      jquery-ui-rails
+      jquery-ui-rails (~> 5.0)
       kaminari (~> 0.15)
-      rails (>= 3.2, <= 4.1)
+      rails (>= 3.2, < 4.2)
       ransack (~> 1.0)
       sass-rails
 
@@ -41,7 +40,8 @@ GIT
 
 GIT
   remote: git://github.com/rosa-abf/grit.git
-  revision: baa333d93615085a8d2304d1f5135bf48f37ed3d
+  revision: a9548c92188cc307e7af1dd41a733e7000a783a9
+  tag: 2.6.16
   specs:
     grit (2.5.0)
       diff-lcs (~> 1.1)
@@ -52,63 +52,59 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (4.0.5)
+    actionmailer (4.0.9)
-      actionpack (= 4.0.5)
+      actionpack (= 4.0.9)
       mail (~> 2.5.4)
-    actionpack (4.0.5)
+    actionpack (4.0.9)
-      activesupport (= 4.0.5)
+      activesupport (= 4.0.9)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.5)
+    activemodel (4.0.9)
-      activesupport (= 4.0.5)
+      activesupport (= 4.0.9)
       builder (~> 3.1.0)
-    activerecord (4.0.5)
+    activerecord (4.0.9)
-      activemodel (= 4.0.5)
+      activemodel (= 4.0.9)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.5)
+      activesupport (= 4.0.9)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.5)
+    activesupport (4.0.9)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    airbrake (3.1.16)
+    addressable (2.3.6)
+    airbrake (3.2.1)
       builder
       multi_json
-    ancestry (2.0.0)
+    ancestry (2.1.0)
       activerecord (>= 3.0.0)
     angular-i18n (0.1.2)
-    angular-rails-templates (0.0.7)
+    angular-rails-templates (0.1.3)
       railties (>= 3.1)
       sprockets
-    angular-ui-bootstrap-rails (0.10.0)
+      tilt
-    angularjs-rails (1.2.15)
+    angular-ui-bootstrap-rails (0.11.2)
-    arbre (1.0.1)
+    angularjs-rails (1.2.22)
+    arbre (1.0.2)
       activesupport (>= 3.0.0)
     arel (4.0.2)
-    attr_encrypted (1.3.2)
+    attr_encrypted (1.3.3)
       encryptor (>= 1.3.0)
     bcrypt (3.1.7)
-    bcrypt-ruby (3.1.5)
+    better_errors (2.0.0)
-      bcrypt (>= 3.1.3)
-    better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
+      rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bluepill (0.0.64)
+    bootstrap-sass (3.2.0.2)
-      activesupport (>= 3.0.0)
+      sass (~> 3.2)
-      daemons (~> 1.1.4)
+    bourbon (3.2.3)
-      i18n (>= 0.5.0)
-      state_machine (~> 1.1)
-    bootstrap-sass (3.1.1.0)
       sass (~> 3.2)
-    bourbon (3.1.8)
-      sass (>= 3.2.0)
       thor
     builder (3.1.4)
     callsite (0.0.11)
@@ -120,34 +116,36 @@ GEM
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     capistrano_colors (0.5.5)
-    charlock_holmes (0.6.9.4)
+    charlock_holmes (0.7.3)
     chronic (0.10.2)
-    chunky_png (1.3.0)
+    chunky_png (1.3.1)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.3)
+    cocaine (0.5.4)
       climate_control (>= 0.0.3, < 1.0)
-    codemirror-rails (4.0)
+    codemirror-rails (4.5)
       railties (>= 3.0, < 5)
     coderay (1.1.0)
-    coffee-rails (4.0.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.8.0)
-    compass (0.12.3)
+    compass (0.12.7)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (= 3.2.14)
+      sass (~> 3.2.19)
-    compass-rails (1.1.6)
+    compass-rails (2.0.0)
       compass (>= 0.12.2)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     creole (0.5.0)
     daemons (1.1.9)
     debug_inspector (0.0.2)
-    devise (3.2.3)
+    devise (3.3.0)
-      bcrypt-ruby (~> 3.0)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       thread_safe (~> 0.1)
@@ -158,7 +156,7 @@ GEM
     erubis (2.7.0)
     escape_utils (1.0.1)
     eventmachine (1.0.3)
-    execjs (2.0.2)
+    execjs (2.2.2)
     expression_parser (0.9.0)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
@@ -168,33 +166,35 @@ GEM
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
-    font-awesome-rails (4.1.0.0)
+    font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
-    formtastic (2.3.0.rc2)
+    formtastic (2.3.0)
       actionpack (>= 3.0)
-    friendly_id (5.0.3)
+    friendly_id (5.0.4)
       activerecord (>= 4.0.0)
     fssm (0.2.10)
-    gemoji (1.2.1)
+    gemoji (2.1.0)
-    github-linguist (2.10.11)
+    github-linguist (3.1.2)
-      charlock_holmes (~> 0.6.6)
+      charlock_holmes (~> 0.7.3)
-      escape_utils (>= 0.3.1)
+      escape_utils (~> 1.0.1)
       mime-types (~> 1.19)
-      pygments.rb (~> 0.5.4)
+      pygments.rb (~> 0.6.0)
-    github-markup (0.7.5)
+      rugged (~> 0.21.0)
-    gitlab-grit (2.6.0)
+    github-markup (1.1.2)
-      charlock_holmes (~> 0.6.9)
+      posix-spawn (~> 0.3.8)
+    gitlab-grit (2.6.10)
+      charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
+      posix-spawn (~> 0.3)
-    gli (2.9.0)
+    gli (2.12.0)
-    gollum-lib (2.0.0)
+    gollum-lib (3.0.0)
-      github-markup (>= 0.7.5, < 1.0.0)
+      github-markup (~> 1.1.0)
-      gitlab-grit (= 2.6.0)
+      gitlab-grit (~> 2.6.5)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6.1)
-      rouge (~> 1.3.1)
+      rouge (~> 1.3.3)
-      sanitize (~> 2.0.6)
+      sanitize (~> 2.1.0)
-      stringex (~> 2.1.0)
+      stringex (~> 2.5.1)
     haml (4.0.5)
       tilt
     haml-rails (0.5.3)
@@ -205,41 +205,39 @@ GEM
     has_scope (0.6.0.rc)
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
-    hashie (2.0.5)
+    hashie (3.3.1)
     highline (1.6.21)
     hike (1.2.3)
-    hirb (0.7.1)
+    hirb (0.7.2)
-    i18n (0.6.9)
+    i18n (0.6.11)
     inherited_resources (1.4.1)
       has_scope (~> 0.6.0.rc)
       responders (~> 1.0.0.rc)
-    jbuilder (2.0.4)
+    jbuilder (2.1.3)
-      activesupport (>= 3.0.0)
+      activesupport (>= 3.0.0, < 5)
-      multi_json (>= 1.2.0)
+      multi_json (~> 1.2)
     jquery-migrate-rails (1.2.1)
     jquery-rails (2.3.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.2.0)
+    jquery-ui-rails (5.0.0)
       railties (>= 3.2.16)
-    js-routes (0.9.7)
+    js-routes (0.9.9)
       railties (>= 3.2)
       sprockets-rails
     json (1.8.1)
-    jwt (0.1.11)
+    jwt (1.0.0)
-      multi_json (>= 1.5)
+    kaminari (0.16.1)
-    kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     libv8 (3.16.14.3)
-    localeapp (0.7.1)
+    localeapp (0.8.1)
       gli
       i18n
       json
       rack
       rest-client
       ya2yaml
-    logglier (0.2.11)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -253,40 +251,41 @@ GEM
       skinny (>= 0.1.2)
       sqlite3-ruby
       thin
-    meta-tags (1.5.0)
+    meta-tags (2.0.0)
-      actionpack
+      actionpack (>= 3.0.0)
-    meta_request (0.2.8)
+    meta_request (0.3.4)
-      callsite
+      callsite (~> 0.0, >= 0.0.11)
-      rack-contrib
+      rack-contrib (~> 1.1)
-      railties
+      railties (>= 3.0.0, < 5.0.0)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
+    mini_portile (0.6.0)
     minitest (4.7.5)
-    mock_redis (0.11.0)
+    mock_redis (0.13.2)
-    momentjs-rails (2.5.1)
+    momentjs-rails (2.8.1)
       railties (>= 3.1)
     mono_logger (1.1.0)
-    multi_json (1.10.0)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nest (1.1.2)
       redis
-    net-scp (1.1.2)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
+    net-ssh (2.9.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    newrelic_rpm (3.7.3.204)
+    netrc (0.7.7)
+    newrelic_rpm (3.9.3.241)
     ng-rails-csrf (0.1.0)
     ngmin-rails (0.4.0)
       rails (>= 3.1)
-    nokogiri (1.6.1)
+    nokogiri (1.6.3.1)
-      mini_portile (~> 0.5.0)
+      mini_portile (= 0.6.0)
-    oauth2 (0.9.3)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
@@ -296,75 +295,75 @@ GEM
       scrivener (~> 0.0.3)
     ohm-expire (0.1.3.2)
       ohm (>= 0.1.5)
-    omniauth (1.2.1)
+    omniauth (1.2.2)
-      hashie (>= 1.2, < 3)
+      hashie (>= 1.2, < 4)
       rack (~> 1.0)
-    omniauth-facebook (1.6.0)
+    omniauth-facebook (2.0.0)
-      omniauth-oauth2 (~> 1.1)
+      omniauth-oauth2 (~> 1.2)
-    omniauth-github (1.1.1)
+    omniauth-github (1.1.2)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
-    omniauth-google-oauth2 (0.2.2)
+    omniauth-google-oauth2 (0.2.5)
-      omniauth (~> 1.0)
+      omniauth (> 1.0)
-      omniauth-oauth2
+      omniauth-oauth2 (~> 1.1)
-    omniauth-oauth2 (1.1.2)
+    omniauth-oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       multi_json (~> 1.3)
-      oauth2 (~> 0.9.3)
+      oauth2 (~> 1.0)
       omniauth (~> 1.2)
     orm_adapter (0.5.0)
-    paperclip (4.1.1)
+    paperclip (4.2.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
     pg (0.17.1)
-    polyamorous (0.6.4)
+    polyamorous (1.1.0)
       activerecord (>= 3.0)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
-    posix-spawn (0.3.8)
+    posix-spawn (0.3.9)
-    protected_attributes (1.0.7)
+    protected_attributes (1.0.8)
       activemodel (>= 4.0.1, < 5.0)
-    puma (2.8.2)
+    puma (2.9.1)
       rack (>= 1.1, < 2.0)
-    pygments.rb (0.5.4)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rack-throttle (0.3.0)
       rack (>= 1.0.0)
-    rails (4.0.5)
+    rails (4.0.9)
-      actionmailer (= 4.0.5)
+      actionmailer (= 4.0.9)
-      actionpack (= 4.0.5)
+      actionpack (= 4.0.9)
-      activerecord (= 4.0.5)
+      activerecord (= 4.0.9)
-      activesupport (= 4.0.5)
+      activesupport (= 4.0.9)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.5)
+      railties (= 4.0.9)
-      sprockets-rails (~> 2.0.0)
+      sprockets-rails (~> 2.0)
     rails3-generators (1.0.0)
       railties (>= 3.0.0)
-    rails3-jquery-autocomplete (1.0.12)
+    rails3-jquery-autocomplete (1.0.14)
       rails (>= 3.0)
-    railties (4.0.5)
+    railties (4.0.9)
-      actionpack (= 4.0.5)
+      actionpack (= 4.0.9)
-      activesupport (= 4.0.5)
+      activesupport (= 4.0.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.1)
+    rake (10.3.2)
-    ransack (1.2.1)
+    ransack (1.3.0)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
-      polyamorous (~> 0.6.0)
+      polyamorous (~> 1.1)
-    rdiscount (2.1.7)
+    rdiscount (2.1.7.1)
-    redcarpet (3.1.1)
+    redcarpet (3.1.2)
     redis (3.0.7)
     redis-actionpack (4.0.0)
       actionpack (~> 4)
@@ -373,8 +372,8 @@ GEM
     redis-activesupport (4.0.0)
       activesupport (~> 4)
       redis-store (~> 1.1.0)
-    redis-namespace (1.4.1)
+    redis-namespace (1.5.1)
-      redis (~> 3.0.4)
+      redis (~> 3.0, >= 3.0.4)
     redis-rack (1.5.0)
       rack (~> 1.5)
       redis-store (~> 1.1.0)
@@ -398,20 +397,21 @@ GEM
       redis (~> 3.0.4)
       resque (~> 1.25.1)
       rufus-scheduler (~> 2.0.24)
-    resque-status (0.4.2)
+    resque-status (0.4.3)
       resque (~> 1.19)
     resque_mailer (2.2.6)
       actionmailer (>= 3.0)
-    rest-client (1.6.7)
+    rest-client (1.7.2)
-      mime-types (>= 1.16)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rinku (1.7.3)
-    rouge (1.3.3)
+    rouge (1.3.4)
     rr (1.1.2)
     rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    rspec-rails (2.14.1)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
@@ -424,20 +424,22 @@ GEM
       sprockets (>= 2.0.0)
     rufus-scheduler (2.0.24)
       tzinfo (>= 0.3.22)
+    rugged (0.21.0)
     russian (0.6.0)
       i18n (>= 0.5.0)
-    rvm-capistrano (1.5.1)
+    rvm-capistrano (1.5.3)
       capistrano (~> 2.15.4)
-    sanitize (2.0.6)
+    safe_yaml (1.0.3)
+    sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.2.14)
+    sass (3.2.19)
     sass-rails (4.0.2)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2.0)
       sprockets (~> 2.8, <= 2.11.0)
       sprockets-rails (~> 2.0.0)
-    schema_plus (1.4.1)
+    schema_plus (1.5.3)
-      rails (>= 3.2)
+      activerecord (>= 3.2)
       valuable
     scrivener (0.0.3)
     shotgun (0.9)
@@ -445,21 +447,21 @@ GEM
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
+    shoulda-context (1.2.1)
-    shoulda-matchers (2.5.0)
+    shoulda-matchers (2.6.2)
       activesupport (>= 3.0.0)
-    sinatra (1.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sitemap_generator (5.0.1)
+    sitemap_generator (5.0.5)
       builder
     skinny (0.2.3)
       eventmachine (~> 1.0.0)
       thin (~> 1.5.0)
-    skype (0.2.7)
+    skype (0.2.8)
       tmp_cache
-    soundmanager-rails (1.0.0)
+    soundmanager-rails (1.0.1)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -473,8 +475,9 @@ GEM
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     state_machine (1.2.0)
-    stringex (2.1.2)
+    stringex (2.5.2)
-    test_after_commit (0.2.3)
+    test_after_commit (0.2.5)
+      activerecord (>= 3.2)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
@@ -483,7 +486,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     time_diff (0.3.0)
       activesupport
@@ -493,16 +496,19 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
+    tzinfo (0.3.41)
-    uglifier (2.5.0)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    underscore-rails (1.6.0)
+    underscore-rails (1.7.0)
     valuable (0.9.8)
     vegas (0.1.11)
       rack (>= 1.0.0)
     warden (1.2.3)
       rack (>= 1.0)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
     whenever (0.9.2)
       activesupport (>= 2.3.4)
       chronic (>= 0.6.3)
@@ -510,7 +516,7 @@ GEM
       builder
       expression_parser
       rinku
-    will_paginate (3.0.5)
+    will_paginate (3.0.7)
     ya2yaml (0.31)
     yajl-ruby (1.1.0)
     zeroclipboard-rails (0.1.0)
@@ -522,48 +528,46 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   activeadmin!
-  airbrake (~> 3.1.2)
+  airbrake (~> 3.1)
-  ancestry (~> 2.0.0)
+  ancestry (~> 2.1)
   angular-i18n (= 0.1.2)
   angular-rails-templates
   angular-ui-bootstrap-rails
   angularjs-rails (~> 1.2.15)
-  attr_encrypted (~> 1.3.2)
+  attr_encrypted (~> 1.3)
   better_errors
   binding_of_caller
-  bluepill (~> 0.0.60)
+  bootstrap-sass (~> 3.2)
-  bootstrap-sass (~> 3.1.1)
   cancan!
   cape
   capistrano
   capistrano_colors
-  charlock_holmes (~> 0.6.9)
+  charlock_holmes (~> 0.7)
-  codemirror-rails
+  codemirror-rails (~> 4.5)
-  coffee-rails (~> 4.0.1)
+  coffee-rails (~> 4.1)
-  compass-rails (~> 1.1.6)
+  compass-rails (~> 2.0)
   creole
-  devise (~> 3.2.3)
+  devise (~> 3.3)
   diff-display (~> 0.0.1)
   factory_girl_rails (~> 4.4.1)
   ffi (~> 1.9.3)
-  font-awesome-rails (~> 4.1)
+  font-awesome-rails (~> 4.2)
-  friendly_id (~> 5.0.3)
+  friendly_id (~> 5.0)
-  gemoji (~> 1.2.1)
+  gemoji (~> 2.1)
-  github-linguist (~> 2.10)
+  github-linguist (~> 3.1)
-  gollum-lib (~> 2.0)
+  gollum-lib (~> 3.0)
   grack!
   grit!
   haml-rails (~> 0.5)
   highline (~> 1.6.20)
   hirb
-  jbuilder (~> 2.0.3)
+  jbuilder (~> 2.1)
   jquery-migrate-rails
-  jquery-rails (~> 2.3.0)
+  jquery-rails (~> 2.3)
   js-routes
   localeapp
-  logglier
   mailcatcher
-  meta-tags (~> 1.5)
+  meta-tags (~> 2.0)
   meta_request
   mock_redis (~> 0.11)
   momentjs-rails
@@ -576,31 +580,31 @@ DEPENDENCIES
   omniauth-facebook
   omniauth-github
   omniauth-google-oauth2
-  paperclip (~> 4.1.1)
+  paperclip (~> 4.2)
   perform_later!
   pg (~> 0.17.1)
   protected_attributes
   puma
   rack-throttle (~> 0.3.0)
-  rails (= 4.0.5)
+  rails (= 4.0.9)
   rails3-generators
   rails3-jquery-autocomplete (~> 1.0)
   rake
   rdiscount
-  redcarpet (~> 3.1.1)
+  redcarpet (~> 3.1)
   redis-rails (~> 4.0)
   resque (~> 1.25)
   resque-scheduler (~> 2.5.4)
-  resque-status (~> 0.4.2)
+  resque-status (~> 0.4)
   resque_mailer (~> 2.2)
-  rest-client (~> 1.6.7)
+  rest-client (~> 1.7)
   rr (~> 1.1.2)
   rspec-rails (~> 2.14.1)
   ruby-haml-js (~> 0.0.5)
   russian (~> 0.6.0)
   rvm-capistrano
-  sass-rails (~> 4.0.1)
+  sass-rails (~> 4.0)
-  schema_plus (~> 1.4.0)
+  schema_plus (~> 1.5)
   shotgun
   shoulda
   shoulda-matchers
@@ -610,12 +614,13 @@ DEPENDENCIES
   state_machine (~> 1.2)
   test_after_commit
   therubyracer (~> 0.12.1)
-  therubyrhino (~> 1.73.1)
+  therubyrhino (~> 2.0)
   time_diff
   timecop
   uglifier (~> 2.5)
   underscore-rails
+  webmock
   whenever (~> 0.9.0)
   wikicloth
-  will_paginate (~> 3.0.5)
+  will_paginate (~> 3.0)
-  zeroclipboard-rails
+  zeroclipboard-rails (~> 0.1.0)

Rakefile

@@ -5,5 +5,6 @@ require File.expand_path('../config/application', __FILE__)
 require 'rake'
 require 'resque/tasks'
 require 'resque_scheduler/tasks'
+load    'tasks/emoji.rake'
 
 Rosa::Application.load_tasks

app/admin/build_scripts.rb

@@ -23,7 +23,7 @@ ActiveAdmin.register BuildScript do
     end
     column :updated_at
 
-    default_actions
+    actions
   end
 
   show do

app/admin/event_logs.rb

@@ -31,7 +31,7 @@ ActiveAdmin.register EventLog do
     end
 
 
-    default_actions
+    actions
   end
 
 end

app/admin/flash_notifies.rb

@@ -12,7 +12,7 @@ ActiveAdmin.register FlashNotify do
     end
     column :published
 
-    default_actions
+    actions
   end
 
   form do |f|

app/admin/node_instructions.rb

@@ -21,7 +21,7 @@ ActiveAdmin.register NodeInstruction do
     end
     column :updated_at
 
-    default_actions
+    actions
   end
 
   form do |f|

app/admin/register_requests.rb

@@ -14,7 +14,7 @@ ActiveAdmin.register RegisterRequest do
     column :more
     column :created_at
 
-    default_actions
+    actions
   end
 
 end

app/admin/users.rb

@@ -26,7 +26,7 @@ ActiveAdmin.register User do
     column :created_at
     column :role
 
-    default_actions
+    actions
   end
 
   form do |f|