Merge branch 'master' into 29-migrate-to-ruby-2.1

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb

.gitignore

@@ -20,3 +20,8 @@ crash.log
 config/newrelic.yml
 config/deploy/*.rb
 config/deploy.rb
+.swo
+.swn
+.ruby-gemset
+.ruby-version
+.localeapp

.travis.yml

@@ -0,0 +1,25 @@
+language: ruby
+rvm:
+  - 1.9.3
+bundler_args: --without development
+env:
+  - SPEC_GROUP=controllers
+  - SPEC_GROUP=platform_controllers
+  - SPEC_GROUP=api
+  - SPEC_GROUP=models
+  - SPEC_GROUP=others
+before_install:
+  - sudo apt-get update
+  - sudo apt-get --no-install-recommends install bash curl git patch bzip2 build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev libgdbm-dev ncurses-dev automake libtool bison subversion pkg-config libffi-dev libicu-dev rpm
+  - gem update --system
+  - gem --version
+  - git config --global user.email "abf@travis.com"
+  - git config --global user.name "ABF"
+before_script:
+  - cp config/database.yml.sample config/database.yml
+  - cp config/application.yml.travis config/application.yml
+  - bundle exec rake db:create db:structure:load db:migrate
+script: "./travis.sh"
+branches:
+  only:
+    - /.*/

Gemfile

@@ -1,66 +1,86 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.13' #, :git => 'git://github.com/rails/rails.git'
-gem 'redhillonrails_core', :git => 'git://github.com/warpc/redhillonrails_core.git', :branch => 'rails31' # '~> 2.0.0.pre' # deprecated
+gem 'rails', '3.2.16' #, :git => 'git://github.com/rails/rails.git'
+gem 'redhillonrails_core', :git => 'git://github.com/rosa-abf/redhillonrails_core.git', :branch => 'rails31' # '~> 2.0.0.pre' # deprecated
 
 gem 'pg', '~> 0.14.0'
 
-gem 'devise', '~> 2.1.2'
-gem 'omniauth', '~> 1.1.0'
-gem 'omniauth-openid', '~> 1.0.1'
+gem 'devise', '~> 2.2.3'
+gem 'omniauth'
+gem 'omniauth-facebook'
+gem 'omniauth-google-oauth2'
+gem 'omniauth-github'
+# gem 'omniauth-openid', '~> 1.0.1'
 gem 'cancan', '1.6.7' # 1.6.8 fail specs with strange error
 
 gem 'ancestry', '~> 1.3.0'
 gem 'paperclip', '~> 3.3.1'
-gem 'resque', '~> 1.21.0'
+gem 'resque', '~> 1.24'
 gem 'resque-status', '~> 0.3.3'
-gem 'resque_mailer', '~> 2.1.0'
+gem 'resque_mailer', '~> 2.2'
 gem 'perform_later', '~> 1.3.0' # should be after resque_mailer
 gem 'russian', '~> 0.6.0'
 gem 'highline', '~> 1.6.11'
 gem 'state_machine'
+gem 'redis-rails'
 
-gem 'grack', :git => 'git://github.com/rdblue/grack.git', :require => 'git_http'
-gem 'grit', :git => 'git://github.com/avokhmin/grit.git', :branch => '117-pack-format-error'
-# gem "grit", :git => 'git://github.com/warpc/grit.git' #, :path => '~/Sites/code/grit'
+gem 'grack', :git => 'git://github.com/rosa-abf/grack.git', :require => 'git_http'
+gem "gitlab-grit", "~> 2.6.3"
 gem 'charlock_holmes', '~> 0.6.9' #, :git => 'git://github.com/brianmario/charlock_holmes.git', :branch => 'bundle-icu'
-gem 'github-linguist', '~> 2.2.1', :require => 'linguist'
+gem 'github-linguist', '~> 2.3.4', :require => 'linguist'
 gem 'diff-display', '~> 0.0.1'
 
 # Wiki
 gem "gollum", '~> 2.1.3'
-gem "redcarpet", "~> 2.1.1"
+gem "redcarpet", '~> 2.2.2'
 gem 'creole'
 gem 'rdiscount'
 # gem 'org-ruby'
 gem 'RedCloth'
 gem 'wikicloth'
 
-gem 'unicorn', '~> 4.3.1', :platforms => [:mri, :rbx]
+# gem 'unicorn', '~> 4.3.1', :platforms => [:mri, :rbx]
 gem 'trinidad', '~> 1.0.2', :platforms => :jruby
-gem 'newrelic_rpm', '~> 3.5.8.72', :platforms => [:mri, :rbx]
+
+gem 'newrelic_rpm'
 gem 'whenever', '~> 0.7.3', :require => false
 
-gem 'jbuilder', '~> 0.8.2'
+gem 'jbuilder', '~> 1.4.2'
 gem 'rails3-jquery-autocomplete', '~> 1.0.7'
 gem 'will_paginate', '~> 3.0.3'
 gem 'meta-tags', '~> 1.2.5', :require => 'meta_tags'
 gem "haml-rails", '~> 0.3.4'
 gem 'jquery-rails', '~> 2.0.2'
 gem 'ruby-haml-js', '~> 0.0.3'
-gem 'rails-backbone', '~> 0.7.2'
+gem 'friendly_id'
 
 gem 'rack-throttle'
 gem 'rest-client', '~> 1.6.6'
+gem 'ohm'
+gem 'ohm-expire'
+
+gem 'ffi'
 
 gem 'attr_encrypted', '1.2.1'
+gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
+
+# AngularJS related stuff
+gem 'underscore-rails'
+gem 'angularjs-rails'
+gem 'ng-rails-csrf'
+gem 'momentjs-rails'
+gem 'angular-i18n', '0.1.2'
+gem 'js-routes'
+gem 'soundmanager-rails'
+
+gem 'time_diff'
 
 group :assets do
   gem 'sass-rails', '~> 3.2.5'
   gem 'coffee-rails', '~> 3.2.2'
   gem 'compass-rails', '~> 1.0.3'
   gem 'uglifier', '~> 1.2.4'
-  gem 'therubyracer', '~> 0.10.2', :platforms => [:mri, :rbx]
+  #gem 'therubyracer', '~> 0.10.2', :platforms => [:mri, :rbx]
   gem 'therubyrhino', '~> 1.73.1', :platforms => :jruby
   gem 'turbo-sprockets-rails3'
 end
@@ -68,6 +88,9 @@ end
 group :production do
   gem "airbrake", '~> 3.1.2'
   gem 'bluepill', '~> 0.0.60', :require => false
+  # gem 'le'
+  gem 'logglier'
+  gem 'puma'
 end
 
 group :development do
@@ -80,6 +103,11 @@ group :development do
   gem 'rvm-capistrano', :require => false
   gem 'cape', :require => false
   gem 'capistrano_colors', :require => false
+  # Better Errors & RailsPanel
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  gem 'meta_request'
+  gem 'localeapp'
 end
 
 group :test do
@@ -88,4 +116,5 @@ group :test do
   gem 'rr',                 '~> 1.0.4'
   gem 'shoulda'
   gem 'mock_redis',         '0.6.2'
+  gem 'rake'
 end

Gemfile.lock

@@ -1,21 +1,11 @@
 GIT
-  remote: git://github.com/avokhmin/grit.git
-  revision: 1495f405d2b34e76dcc976db557df350b175e4b2
-  branch: 117-pack-format-error
-  specs:
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-
-GIT
-  remote: git://github.com/rdblue/grack.git
+  remote: git://github.com/rosa-abf/grack.git
   revision: 020be3fef3fb308b9d214252522aa5945bf6584a
   specs:
     grack (0.2.0)
 
 GIT
-  remote: git://github.com/warpc/redhillonrails_core.git
+  remote: git://github.com/rosa-abf/redhillonrails_core.git
   revision: c0945a4c6ad4bae4ca2750b105efcff162408b15
   branch: rails31
   specs:
@@ -26,12 +16,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    actionmailer (3.2.16)
+      actionpack (= 3.2.16)
+      mail (~> 2.5.4)
+    actionpack (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -39,59 +29,66 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activeresource (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
+    activesupport (3.2.16)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    airbrake (3.1.9)
+    airbrake (3.1.12)
       activesupport
       builder
       json
     ancestry (1.3.0)
       activerecord (>= 2.3.14)
-    arel (3.0.2)
+    angular-i18n (0.1.2)
+    angularjs-rails (1.0.7)
+    arel (3.0.3)
     attr_encrypted (1.2.1)
       encryptor (>= 1.1.1)
-    bcrypt-ruby (3.0.1)
+    bcrypt-ruby (3.1.1)
+    better_errors (0.9.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     blankslate (3.1.2)
-    bluepill (0.0.62)
-      activesupport (>= 3.0.0)
+    bluepill (0.0.66)
+      activesupport (>= 3.0.0, < 4.0.0)
       daemons (~> 1.1.4)
       i18n (>= 0.5.0)
-      state_machine (~> 1.1.0)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
+      state_machine (~> 1.1)
     builder (3.0.4)
+    callsite (0.0.11)
     cancan (1.6.7)
     cape (1.7.0)
-    capistrano (2.14.2)
+    capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     capistrano_colors (0.5.5)
-    charlock_holmes (0.6.9.3)
+    charlock_holmes (0.6.9.4)
     chronic (0.6.7)
     chunky_png (1.2.8)
     cocaine (0.4.2)
+    coderay (1.0.9)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -100,14 +97,14 @@ GEM
       compass (>= 0.12.2, < 0.14)
     creole (0.5.0)
     daemons (1.1.9)
-    devise (2.1.3)
+    debug_inspector (0.0.2)
+    devise (2.2.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
     diff-display (0.0.1)
     diff-lcs (1.1.3)
-    ejs (1.0.0)
     encryptor (1.1.3)
     erubis (2.7.0)
     escape_utils (0.2.4)
@@ -120,15 +117,26 @@ GEM
     factory_girl_rails (4.0.0)
       factory_girl (~> 4.0.0)
       railties (>= 3.0.0)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
     ffi (1.0.11)
+    friendly_id (4.0.10.1)
+      activerecord (>= 3.0, < 4.0)
     fssm (0.2.10)
-    github-linguist (2.2.1)
+    gemoji (1.2.1)
+    github-linguist (2.3.4)
       charlock_holmes (~> 0.6.6)
       escape_utils (~> 0.2.3)
-      mime-types (~> 1.18)
+      mime-types (~> 1.19)
       pygments.rb (>= 0.2.13)
     github-markdown (0.5.3)
     github-markup (0.7.5)
+    gitlab-grit (2.6.3)
+      charlock_holmes (~> 0.6.9)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3.6)
+    gli (2.8.1)
     gollum (2.1.10)
       github-markdown
       github-markup (>= 0.7.0, < 1.0.0)
@@ -141,33 +149,48 @@ GEM
       sinatra (~> 1.0)
       stringex (~> 1.4.0)
       useragent (~> 0.4.9)
+    grit (2.5.0)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3.6)
     haml (3.1.8)
     haml-rails (0.3.5)
       actionpack (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
       haml (~> 3.1)
       railties (>= 3.1, < 4.1)
-    hashie (1.2.0)
-    highline (1.6.16)
-    hike (1.2.1)
+    hashie (2.0.5)
+    highline (1.6.19)
+    hike (1.2.3)
     hirb (0.7.1)
-    i18n (0.6.1)
-    jbuilder (0.8.3)
+    httpauth (0.2.0)
+    i18n (0.6.9)
+    jbuilder (1.4.2)
       activesupport (>= 3.0.0)
+      multi_json (>= 1.2.0)
     journey (1.0.4)
     jquery-rails (2.0.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.7.7)
-    kgio (2.8.0)
-    libv8 (3.3.10.4)
+    js-routes (0.9.3)
+      rails (>= 3.2)
+    json (1.8.1)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    localeapp (0.6.14)
+      gli
+      i18n
+      json
+      rack
+      rest-client
+      ya2yaml
+    logglier (0.2.11)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mailcatcher (0.5.11)
+    mailcatcher (0.5.12)
       activesupport (~> 3.0)
       eventmachine (~> 1.0.0)
       haml (>= 3.1, < 5)
@@ -178,28 +201,58 @@ GEM
       thin (~> 1.5.0)
     meta-tags (1.2.6)
       actionpack
-    metaclass (0.0.1)
-    mime-types (1.22)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
+    meta_request (0.2.7)
+      callsite
+      rack-contrib
+      railties
+    mime-types (1.25.1)
+    mini_portile (0.5.1)
     mock_redis (0.6.2)
-    multi_json (1.7.2)
+    momentjs-rails (2.0.0.2)
+      railties (>= 3.1)
+    mono_logger (1.1.0)
+    multi_json (1.8.2)
+    multipart-post (1.2.0)
     mustache (0.99.4)
-    net-scp (1.1.0)
+    nest (1.1.2)
+      redis
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-sftp (2.1.1)
+    net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.6)
+    net-ssh (2.6.8)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    newrelic_rpm (3.5.8.72)
-    nokogiri (1.5.9)
-    omniauth (1.1.3)
-      hashie (~> 1.2)
+    newrelic_rpm (3.7.0.177)
+    ng-rails-csrf (0.1.0)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.8.1)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      rack (~> 1.2)
+    ohm (1.3.2)
+      nest (~> 1.0)
+      redis
+      scrivener (~> 0.0.3)
+    ohm-expire (0.1.3.2)
+      ohm (>= 0.1.5)
+    omniauth (1.1.4)
+      hashie (>= 1.2, < 3)
       rack
-    omniauth-openid (1.0.1)
+    omniauth-facebook (1.4.1)
+      omniauth-oauth2 (~> 1.1.0)
+    omniauth-github (1.1.1)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.1)
+    omniauth-google-oauth2 (0.2.0)
+      omniauth (~> 1.0)
+      omniauth-oauth2
+    omniauth-oauth2 (1.1.1)
+      oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
     orm_adapter (0.4.0)
     paperclip (3.3.1)
       activemodel (>= 3.0.0)
@@ -214,14 +267,15 @@ GEM
     pg (0.14.1)
     polyglot (0.3.3)
     posix-spawn (0.3.6)
+    puma (2.7.1)
+      rack (>= 1.1, < 2.0)
     pygments.rb (0.2.13)
       rubypython (~> 0.5.3)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-openid (1.3.1)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
+    rack-contrib (1.1.0)
+      rack (>= 0.9.1)
     rack-protection (1.5.0)
       rack
     rack-ssl (1.3.3)
@@ -230,52 +284,64 @@ GEM
       rack (>= 1.0)
     rack-throttle (0.3.0)
       rack (>= 1.0.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
+    rails (3.2.16)
+      actionmailer (= 3.2.16)
+      actionpack (= 3.2.16)
+      activerecord (= 3.2.16)
+      activeresource (= 3.2.16)
+      activesupport (= 3.2.16)
       bundler (~> 1.0)
-      railties (= 3.2.13)
-    rails-backbone (0.7.2)
-      coffee-script (~> 2.2.0)
-      ejs (~> 1.0.0)
-      railties (>= 3.1.0)
+      railties (= 3.2.16)
     rails3-generators (1.0.0)
       railties (>= 3.0.0)
     rails3-jquery-autocomplete (1.0.11)
       rails (~> 3.0)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
+    railties (3.2.16)
+      actionpack (= 3.2.16)
+      activesupport (= 3.2.16)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    raindrops (0.10.0)
-    rake (10.0.4)
-    rdiscount (2.0.7.1)
+    rake (10.1.0)
+    rdiscount (2.1.6)
     rdoc (3.12.2)
       json (~> 1.4)
-    redcarpet (2.1.1)
-    redis (3.0.2)
-    redis-namespace (1.2.1)
+    redcarpet (2.2.2)
+    redis (3.0.4)
+    redis-actionpack (3.2.3)
+      actionpack (~> 3.2.3)
+      redis-rack (~> 1.4.0)
+      redis-store (~> 1.1.0)
+    redis-activesupport (3.2.3)
+      activesupport (~> 3.2.3)
+      redis-store (~> 1.1.0)
+    redis-namespace (1.3.0)
       redis (~> 3.0.0)
+    redis-rack (1.4.2)
+      rack (~> 1.4.1)
+      redis-store (~> 1.1.0)
+    redis-rails (3.2.3)
+      redis-actionpack (~> 3.2.3)
+      redis-activesupport (~> 3.2.3)
+      redis-store (~> 1.1.0)
+    redis-store (1.1.3)
+      redis (>= 2.2.0)
     redisk (0.2.2)
       redis (>= 0.1.1)
       redis-namespace (>= 0.1.0)
-    resque (1.21.0)
+    resque (1.24.1)
+      mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
+      redis-namespace (~> 1.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
     resque-status (0.3.3)
       redisk (>= 0.2.1)
       resque (~> 1.19)
       uuid (~> 2.3)
-    resque_mailer (2.1.0)
-      actionmailer (~> 3.0)
+    resque_mailer (2.2.4)
+      actionmailer (>= 3.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rr (1.0.5)
@@ -292,77 +358,75 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.11.0)
-    ruby-haml-js (0.0.3)
+    ruby-haml-js (0.0.4)
       execjs
       sprockets (>= 2.0.0)
-    ruby-openid (2.2.3)
     rubypython (0.5.3)
       blankslate (>= 2.1.2.3)
       ffi (~> 1.0.7)
     russian (0.6.0)
       i18n (>= 0.5.0)
-    rvm-capistrano (1.2.7)
+    rvm-capistrano (1.4.1)
       capistrano (>= 2.0.0)
-    sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
-    sass (3.2.7)
+    sanitize (2.0.6)
+      nokogiri (>= 1.4.4)
+    sass (3.2.9)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
+    scrivener (0.0.3)
     shotgun (0.9)
       rack (>= 1.0)
-    shoulda (3.4.0)
+    shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.1.0)
-    shoulda-matchers (1.5.6)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.4)
+    shoulda-matchers (2.2.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-    sinatra (1.3.6)
+    sinatra (1.4.3)
       rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     skinny (0.2.3)
       eventmachine (~> 1.0.0)
       thin (~> 1.5.0)
+    soundmanager-rails (0.1.5)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
-    state_machine (1.1.2)
+    state_machine (1.2.0)
     stringex (1.4.0)
     systemu (2.5.2)
-    therubyracer (0.10.2)
-      libv8 (~> 3.3.10)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.18.1)
-    tilt (1.3.6)
-    treetop (1.4.12)
+    tilt (1.4.1)
+    time_diff (0.3.0)
+      activesupport
+      i18n
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     turbo-sprockets-rails3 (0.3.6)
       railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.0.0)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     uglifier (1.2.7)
       execjs (>= 0.3.0)
       multi_json (~> 1.3)
-    unicorn (4.3.1)
-      kgio (~> 2.6)
-      rack
-      raindrops (~> 0.7)
+    underscore-rails (1.5.1)
     useragent (0.4.16)
     uuid (2.3.7)
       macaddr (~> 1.0)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    warden (1.2.1)
+    warden (1.2.3)
       rack (>= 1.0)
     whenever (0.7.3)
       activesupport (>= 2.3.4)
@@ -371,6 +435,7 @@ GEM
       builder
       expression_parser
     will_paginate (3.0.4)
+    ya2yaml (0.31)
 
 PLATFORMS
   ruby
@@ -379,7 +444,11 @@ DEPENDENCIES
   RedCloth
   airbrake (~> 3.1.2)
   ancestry (~> 1.3.0)
+  angular-i18n (= 0.1.2)
+  angularjs-rails
   attr_encrypted (= 1.2.1)
+  better_errors
+  binding_of_caller
   bluepill (~> 0.0.60)
   cancan (= 1.6.7)
   cape
@@ -389,38 +458,53 @@ DEPENDENCIES
   coffee-rails (~> 3.2.2)
   compass-rails (~> 1.0.3)
   creole
-  devise (~> 2.1.2)
+  devise (~> 2.2.3)
   diff-display (~> 0.0.1)
   factory_girl_rails (~> 4.0.0)
-  github-linguist (~> 2.2.1)
+  ffi
+  friendly_id
+  gemoji (~> 1.2.1)
+  github-linguist (~> 2.3.4)
+  gitlab-grit (~> 2.6.3)
   gollum (~> 2.1.3)
   grack!
-  grit!
   haml-rails (~> 0.3.4)
   highline (~> 1.6.11)
   hirb
-  jbuilder (~> 0.8.2)
+  jbuilder (~> 1.4.2)
   jquery-rails (~> 2.0.2)
+  js-routes
+  localeapp
+  logglier
   mailcatcher
   meta-tags (~> 1.2.5)
+  meta_request
   mock_redis (= 0.6.2)
-  newrelic_rpm (~> 3.5.8.72)
-  omniauth (~> 1.1.0)
-  omniauth-openid (~> 1.0.1)
+  momentjs-rails
+  newrelic_rpm
+  ng-rails-csrf
+  ohm
+  ohm-expire
+  omniauth
+  omniauth-facebook
+  omniauth-github
+  omniauth-google-oauth2
   paperclip (~> 3.3.1)
   perform_later (~> 1.3.0)
   pg (~> 0.14.0)
+  puma
   rack-throttle
-  rails (= 3.2.13)
-  rails-backbone (~> 0.7.2)
+  rails (= 3.2.16)
   rails3-generators
   rails3-jquery-autocomplete (~> 1.0.7)
+  rake
   rdiscount
-  redcarpet (~> 2.1.1)
+  redcarpet (~> 2.2.2)
   redhillonrails_core!
-  resque (~> 1.21.0)
+  redis-rails
+  resque (~> 1.24)
   resque-status (~> 0.3.3)
-  resque_mailer (~> 2.1.0)
+  resque_mailer (~> 2.2)
   rest-client (~> 1.6.6)
   rr (~> 1.0.4)
   rspec-rails (~> 2.11.0)
@@ -430,13 +514,14 @@ DEPENDENCIES
   sass-rails (~> 3.2.5)
   shotgun
   shoulda
+  soundmanager-rails
   state_machine
-  therubyracer (~> 0.10.2)
   therubyrhino (~> 1.73.1)
+  time_diff
   trinidad (~> 1.0.2)
   turbo-sprockets-rails3
   uglifier (~> 1.2.4)
-  unicorn (~> 4.3.1)
+  underscore-rails
   whenever (~> 0.7.3)
   wikicloth
   will_paginate (~> 3.0.3)

LICENSE.txt

@@ -2,8 +2,6 @@ ROSA ABF is Copyright 2010-2013 ROSA CJSC.
 
 ROSA CJSC ("ROSA") distributes the ABF source code under the GNU General Public License (GPL), version 2.0 or later.
 
-The image and icon files in ABF are copyright ROSA CJSC ("ROSA"), but unlike the source code they are not licensed under the GPL version 2.0 or later. ROSA grants you the right to use them for testing and development purposes only, but not to use them in production (commercially or non-commercially).
-
 Third-party copyright in this distribution is noted where applicable.
 
 All rights not expressly granted are reserved.

README

@@ -1,256 +0,0 @@
-== Welcome to Rails
-
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
-
-This pattern splits the view (also called the presentation) into "dumb"
-templates that are primarily responsible for inserting pre-built data in between
-HTML tags. The model contains the "smart" domain objects (such as Account,
-Product, Person, Post) that holds all the business logic and knows how to
-persist themselves to a database. The controller handles the incoming requests
-(such as Save New Account, Update Product, Show Post) by manipulating the model
-and directing data to the view.
-
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
-
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails. You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
-
-
-== Getting Started
-
-1. At the command prompt, create a new Rails application:
-       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
-
-2. Change directory to <tt>myapp</tt> and start the web server:
-       <tt>cd myapp; rails server</tt> (run with --help for options)
-
-3. Go to http://localhost:3000/ and you'll see:
-       "Welcome aboard: You're riding Ruby on Rails!"
-
-4. Follow the guidelines to start developing your application. You can find
-the following resources handy:
-
-* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
-* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
-
-
-== Debugging Rails
-
-Sometimes your application goes wrong. Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
-
-First area to check is the application log files. Have "tail -f" commands
-running on the server.log and development.log. Rails will automatically display
-debugging and runtime information to these files. Debugging info will also be
-shown in the browser on requests from 127.0.0.1.
-
-You can also log your own messages directly into the log file from your code
-using the Ruby logger class from inside your controllers. Example:
-
-  class WeblogController < ActionController::Base
-    def destroy
-      @weblog = Weblog.find(params[:id])
-      @weblog.destroy
-      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
-    end
-  end
-
-The result will be a message in your log file along the lines of:
-
-  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
-
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-
-Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
-several books available online as well:
-
-* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
-* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
-
-These two books will bring you up to speed on the Ruby language and also on
-programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your
-Mongrel or WEBrick server with --debugger. This means that you can break out of
-execution at any point in the code, investigate and change the model, and then,
-resume execution! You need to install ruby-debug to run the server in debugging
-mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.find(:all)
-      debugger
-    end
-  end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
-  >> @posts.inspect
-  => "[#<Post:0x14a6be8
-          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
-       #<Post:0x14a6620
-          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
-  >> @posts.first.title = "hello from a debugger"
-  => "hello from a debugger"
-
-...and even better, you can examine how your runtime objects actually work:
-
-  >> f = @posts.first
-  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
-  >> f.
-  Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you can enter "cont".
-
-
-== Console
-
-The console is a Ruby shell, which allows you to interact with your
-application's domain model. Here you'll have all parts of the application
-configured, just like it is when the application is running. You can inspect
-domain models, change values, and save to the database. Starting the script
-without arguments will launch it in the development environment.
-
-To start the console, run <tt>rails console</tt> from the application
-directory.
-
-Options:
-
-* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
-  made to the database.
-* Passing an environment name as an argument will load the corresponding
-  environment. Example: <tt>rails console production</tt>.
-
-To reload your controllers and models after launching the console run
-<tt>reload!</tt>
-
-More information about irb can be found at:
-link:http://www.rubycentral.com/pickaxe/irb.html
-
-
-== dbconsole
-
-You can go to the command line of your database directly through <tt>rails
-dbconsole</tt>. You would be connected to the database with the credentials
-defined in database.yml. Starting the script without arguments will connect you
-to the development database. Passing an argument will connect you to a different
-database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
-PostgreSQL and SQLite 3.
-
-== Description of Contents
-
-The default directory structure of a generated Ruby on Rails application:
-
-  |-- app
-  |   |-- controllers
-  |   |-- helpers
-  |   |-- mailers
-  |   |-- models
-  |   `-- views
-  |       `-- layouts
-  |-- config
-  |   |-- environments
-  |   |-- initializers
-  |   `-- locales
-  |-- db
-  |-- doc
-  |-- lib
-  |   `-- tasks
-  |-- log
-  |-- public
-  |   |-- images
-  |   |-- javascripts
-  |   `-- stylesheets
-  |-- script
-  |-- test
-  |   |-- fixtures
-  |   |-- functional
-  |   |-- integration
-  |   |-- performance
-  |   `-- unit
-  |-- tmp
-  |   |-- cache
-  |   |-- pids
-  |   |-- sessions
-  |   `-- sockets
-  `-- vendor
-      `-- plugins
-
-app
-  Holds all the code that's specific to this particular application.
-
-app/controllers
-  Holds controllers that should be named like weblogs_controller.rb for
-  automated URL mapping. All controllers should descend from
-  ApplicationController which itself descends from ActionController::Base.
-
-app/models
-  Holds models that should be named like post.rb. Models descend from
-  ActiveRecord::Base by default.
-
-app/views
-  Holds the template files for the view that should be named like
-  weblogs/index.html.erb for the WeblogsController#index action. All views use
-  eRuby syntax by default.
-
-app/views/layouts
-  Holds the template files for layouts to be used with views. This models the
-  common header/footer method of wrapping views. In your views, define a layout
-  using the <tt>layout :default</tt> and create a file named default.html.erb.
-  Inside default.html.erb, call <% yield %> to render the view using this
-  layout.
-
-app/helpers
-  Holds view helpers that should be named like weblogs_helper.rb. These are
-  generated for you automatically when using generators for controllers.
-  Helpers can be used to wrap functionality for your views into methods.
-
-config
-  Configuration files for the Rails environment, the routing map, the database,
-  and other dependencies.
-
-db
-  Contains the database schema in schema.rb. db/migrate contains all the
-  sequence of Migrations for your schema.
-
-doc
-  This directory is where your application documentation will be stored when
-  generated using <tt>rake doc:app</tt>
-
-lib
-  Application specific libraries. Basically, any kind of custom code that
-  doesn't belong under controllers, models, or helpers. This directory is in
-  the load path.
-
-public
-  The directory available for the web server. Contains subdirectories for
-  images, stylesheets, and javascripts. Also contains the dispatchers and the
-  default HTML files. This should be set as the DOCUMENT_ROOT of your web
-  server.
-
-script
-  Helper scripts for automation and generation.
-
-test
-  Unit and functional tests along with fixtures. When using the rails generate
-  command, template test files will be generated for you and placed in this
-  directory.
-
-vendor
-  External libraries that the application depends on. Also includes the plugins
-  subdirectory. If the app has frozen rails, those gems also go here, under
-  vendor/rails/. This directory is in the load path.

README.md

@@ -0,0 +1,25 @@
+RosaLab ABF
+===========
+
+A distributed environment to build distributions, supporting all steps from managing source code to creating ISO images. If you have any problems or requests please contact
+[support](https://abf.rosalinux.ru/contact).
+
+**Note: This Documentation is in a beta state. Breaking changes may occur.**
+
+[![Build Status](https://travis-ci.org/rosa-abf/rosa-build.png?branch=master)](https://travis-ci.org/rosa-abf/rosa-build)
+
+* [API](http://abf-doc.rosalinux.ru/abf/api/)
+* [Integration with FileStore (.abf.yml)](http://abf-doc.rosalinux.ru/abf/file_store_integration/)
+* [ISO build environment](http://abf-doc.rosalinux.ru/abf/iso_build/)
+* [Package build environment](http://abf-doc.rosalinux.ru/abf/scripts/)
+* [Deployment](http://abf-doc.rosalinux.ru/abf/deployment/)
+
+## Contributing to rosa-build
+
+A ruby translation project managed on [Locale](http://www.localeapp.com/) that's open to all!
+
+- Edit the translations directly on the [rosa-build](http://www.localeapp.com/projects/public?search=rosa-build) project on Locale.
+- **That's it!**
+- The maintainer will then pull translations from the Locale project and push to Github.
+
+Happy translating!