Merge pull request #338 from abf/rosa-build:29-migrate-to-ruby-2.1

Migrate to ruby 2.1
This commit is contained in:
avm 2014-01-20 17:20:47 +04:00
commit 11a85c4133
417 changed files with 103 additions and 515 deletions

View File

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

View File

@ -25,8 +25,8 @@ gem 'state_machine'
gem 'redis-rails'
gem 'grack', :git => 'git://github.com/rosa-abf/grack.git', :require => 'git_http'
gem 'grit', :git => 'git://github.com/rosa-abf/grit.git' #, :path => '~/Sites/code/grit'
gem 'charlock_holmes', '~> 0.6.9' #, :git => 'git://github.com/brianmario/charlock_holmes.git', :branch => 'bundle-icu'
gem 'grit', :git => 'git://github.com/rosa-abf/grit.git'
gem 'charlock_holmes', '~> 0.6.9'
gem 'github-linguist', '~> 2.3.4', :require => 'linguist'
gem 'diff-display', '~> 0.0.1'
@ -41,8 +41,10 @@ gem 'wikicloth'
# gem 'unicorn', '~> 4.3.1', :platforms => [:mri, :rbx]
gem 'trinidad', '~> 1.0.2', :platforms => :jruby
gem 'newrelic_rpm'
gem 'whenever', '~> 0.7.3', :require => false
# gem 'whenever', '~> 0.7.3', :require => false
gem 'whenever', '~> 0.9.0', :require => false
gem 'jbuilder', '~> 1.4.2'
gem 'rails3-jquery-autocomplete', '~> 1.0.7'

View File

@ -6,7 +6,7 @@ GIT
GIT
remote: git://github.com/rosa-abf/grit.git
revision: f04f779fb052725b964ba259f8073a34e493c0c7
revision: baa333d93615085a8d2304d1f5135bf48f37ed3d
specs:
grit (2.5.0)
diff-lcs (~> 1.1)
@ -52,19 +52,18 @@ GEM
activesupport (3.2.16)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
airbrake (3.1.12)
activesupport
airbrake (3.1.15)
builder
json
multi_json
ancestry (1.3.0)
activerecord (>= 2.3.14)
angular-i18n (0.1.2)
angularjs-rails (1.0.7)
angularjs-rails (1.2.7)
arel (3.0.3)
attr_encrypted (1.2.1)
encryptor (>= 1.1.1)
bcrypt-ruby (3.1.1)
better_errors (0.9.0)
bcrypt-ruby (3.1.2)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
@ -78,7 +77,7 @@ GEM
builder (3.0.4)
callsite (0.0.11)
cancan (1.6.7)
cape (1.7.0)
cape (1.8.0)
capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
@ -87,10 +86,10 @@ GEM
net-ssh-gateway (>= 1.1.0)
capistrano_colors (0.5.5)
charlock_holmes (0.6.9.4)
chronic (0.6.7)
chunky_png (1.2.8)
chronic (0.10.2)
chunky_png (1.2.9)
cocaine (0.4.2)
coderay (1.0.9)
coderay (1.1.0)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@ -107,27 +106,26 @@ GEM
creole (0.5.0)
daemons (1.1.9)
debug_inspector (0.0.2)
devise (2.2.4)
devise (2.2.8)
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)
encryptor (1.1.3)
encryptor (1.3.0)
erubis (2.7.0)
escape_utils (0.2.4)
eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
execjs (2.0.2)
expression_parser (0.9.0)
factory_girl (4.0.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.0.0)
factory_girl (~> 4.0.0)
railties (>= 3.0.0)
faraday (0.8.7)
multipart-post (~> 1.1)
faraday (0.8.9)
multipart-post (~> 1.2.0)
ffi (1.0.11)
friendly_id (4.0.10.1)
activerecord (>= 3.0, < 4.0)
@ -138,7 +136,7 @@ GEM
escape_utils (~> 0.2.3)
mime-types (~> 1.19)
pygments.rb (>= 0.2.13)
github-markdown (0.5.3)
github-markdown (0.6.3)
github-markup (0.7.5)
gli (2.8.1)
gollum (2.1.10)
@ -160,7 +158,7 @@ GEM
haml (~> 3.1)
railties (>= 3.1, < 4.1)
hashie (2.0.5)
highline (1.6.19)
highline (1.6.20)
hike (1.2.3)
hirb (0.7.1)
httpauth (0.2.0)
@ -172,10 +170,10 @@ GEM
jquery-rails (2.0.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
js-routes (0.9.3)
js-routes (0.9.6)
rails (>= 3.2)
json (1.8.1)
jwt (0.1.8)
jwt (0.1.10)
multi_json (>= 1.5)
libv8 (3.3.10.4)
localeapp (0.6.14)
@ -202,31 +200,31 @@ GEM
thin (~> 1.5.0)
meta-tags (1.2.6)
actionpack
meta_request (0.2.7)
meta_request (0.2.8)
callsite
rack-contrib
railties
mime-types (1.25.1)
mini_portile (0.5.1)
mini_portile (0.5.2)
mock_redis (0.6.2)
momentjs-rails (2.0.0.2)
momentjs-rails (2.5.0)
railties (>= 3.1)
mono_logger (1.1.0)
multi_json (1.8.2)
multi_json (1.8.4)
multipart-post (1.2.0)
mustache (0.99.4)
mustache (0.99.5)
nest (1.1.2)
redis
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.8)
net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
newrelic_rpm (3.7.0.177)
newrelic_rpm (3.7.1.182)
ng-rails-csrf (0.1.0)
nokogiri (1.6.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
oauth2 (0.8.1)
faraday (~> 0.8)
@ -243,18 +241,18 @@ GEM
omniauth (1.1.4)
hashie (>= 1.2, < 3)
rack
omniauth-facebook (1.4.1)
omniauth-oauth2 (~> 1.1.0)
omniauth-facebook (1.6.0)
omniauth-oauth2 (~> 1.1)
omniauth-github (1.1.1)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-google-oauth2 (0.2.0)
omniauth-google-oauth2 (0.2.2)
omniauth (~> 1.0)
omniauth-oauth2
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
orm_adapter (0.4.0)
orm_adapter (0.5.0)
paperclip (3.3.1)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
@ -267,7 +265,7 @@ GEM
resque
pg (0.14.1)
polyglot (0.3.3)
posix-spawn (0.3.6)
posix-spawn (0.3.8)
puma (2.7.1)
rack (>= 1.1, < 2.0)
pygments.rb (0.2.13)
@ -277,7 +275,7 @@ GEM
rack (>= 0.4)
rack-contrib (1.1.0)
rack (>= 0.9.1)
rack-protection (1.5.0)
rack-protection (1.5.2)
rack
rack-ssl (1.3.3)
rack
@ -295,8 +293,8 @@ GEM
railties (= 3.2.16)
rails3-generators (1.0.0)
railties (>= 3.0.0)
rails3-jquery-autocomplete (1.0.11)
rails (~> 3.0)
rails3-jquery-autocomplete (1.0.12)
rails (>= 3.0)
railties (3.2.16)
actionpack (= 3.2.16)
activesupport (= 3.2.16)
@ -304,34 +302,34 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.1.0)
rdiscount (2.1.6)
rake (10.1.1)
rdiscount (2.1.7)
rdoc (3.12.2)
json (~> 1.4)
redcarpet (2.2.2)
redis (3.0.4)
redis-actionpack (3.2.3)
actionpack (~> 3.2.3)
redis-rack (~> 1.4.0)
redis (3.0.6)
redis-actionpack (3.2.4)
actionpack (~> 3.2.0)
redis-rack (~> 1.4.4)
redis-store (~> 1.1.4)
redis-activesupport (3.2.5)
activesupport (~> 3.2.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)
redis-namespace (1.4.1)
redis (~> 3.0.4)
redis-rack (1.4.4)
rack (~> 1.4.0)
redis-store (~> 1.1.4)
redis-rails (3.2.4)
redis-actionpack (~> 3.2.4)
redis-activesupport (~> 3.2.4)
redis-store (~> 1.1.4)
redis-store (1.1.4)
redis (>= 2.2)
redisk (0.2.2)
redis (>= 0.1.1)
redis-namespace (>= 0.1.0)
resque (1.24.1)
resque (1.25.1)
mono_logger (~> 1.0)
multi_json (~> 1.0)
redis-namespace (~> 1.2)
@ -341,10 +339,11 @@ GEM
redisk (>= 0.2.1)
resque (~> 1.19)
uuid (~> 2.3)
resque_mailer (2.2.4)
resque_mailer (2.2.6)
actionmailer (>= 3.0)
rest-client (1.6.7)
mime-types (>= 1.16)
rinku (1.7.3)
rr (1.0.5)
rspec (2.11.0)
rspec-core (~> 2.11.0)
@ -359,7 +358,7 @@ GEM
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.11.0)
ruby-haml-js (0.0.4)
ruby-haml-js (0.0.5)
execjs
sprockets (>= 2.0.0)
rubypython (0.5.3)
@ -367,11 +366,11 @@ GEM
ffi (~> 1.0.7)
russian (0.6.0)
i18n (>= 0.5.0)
rvm-capistrano (1.4.1)
capistrano (>= 2.0.0)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
sanitize (2.0.6)
nokogiri (>= 1.4.4)
sass (3.2.9)
sass (3.2.13)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
@ -382,23 +381,23 @@ GEM
shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0)
shoulda-context (1.1.4)
shoulda-matchers (2.2.0)
shoulda-context (1.1.6)
shoulda-matchers (2.5.0)
activesupport (>= 3.0.0)
sinatra (1.4.3)
sinatra (1.4.4)
rack (~> 1.4)
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)
soundmanager-rails (1.0.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
sqlite3 (1.3.8)
state_machine (1.2.0)
stringex (1.4.0)
systemu (2.5.2)
@ -416,14 +415,14 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbo-sprockets-rails3 (0.3.6)
turbo-sprockets-rails3 (0.3.11)
railties (> 3.2.8, < 4.0.0)
sprockets (>= 2.0.0)
sprockets (>= 2.2.0)
tzinfo (0.3.38)
uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)
underscore-rails (1.5.1)
underscore-rails (1.5.2)
useragent (0.4.16)
uuid (2.3.7)
macaddr (~> 1.0)
@ -431,13 +430,14 @@ GEM
rack (>= 1.0.0)
warden (1.2.3)
rack (>= 1.0)
whenever (0.7.3)
whenever (0.9.0)
activesupport (>= 2.3.4)
chronic (~> 0.6.3)
wikicloth (0.8.0)
chronic (>= 0.6.3)
wikicloth (0.8.1)
builder
expression_parser
will_paginate (3.0.4)
rinku
will_paginate (3.0.5)
ya2yaml (0.31)
PLATFORMS
@ -526,6 +526,6 @@ DEPENDENCIES
turbo-sprockets-rails3
uglifier (~> 1.2.4)
underscore-rails
whenever (~> 0.7.3)
whenever (~> 0.9.0)
wikicloth
will_paginate (~> 3.0.3)

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Admin::BaseController < ApplicationController
before_filter :authenticate_user!
load_and_authorize_resource

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Admin::EventLogsController < Admin::BaseController
def index
@event_logs = EventLog.default_order.eager_loading.paginate :page => params[:page]

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Admin::RegisterRequestsController < Admin::BaseController
def index
@register_requests = @register_requests.send((params[:scope] || 'unprocessed').to_sym).paginate(:page => params[:page])

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Admin::UsersController < Admin::BaseController
include AvatarHelper
prepend_before_filter :find_user

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class AdvisoriesController < ApplicationController
before_filter :authenticate_user!
skip_before_filter :authenticate_user! if APP_CONFIG['anonymous_access']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::AdvisoriesController < Api::V1::BaseController
before_filter :authenticate_user!
skip_before_filter :authenticate_user!, :only => [:index, :show] if APP_CONFIG['anonymous_access']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::ArchesController < Api::V1::BaseController
before_filter :authenticate_user! unless APP_CONFIG['anonymous_access']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::BaseController < ApplicationController
include PaginateHelper
#respond_to :json

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::BuildListsController < Api::V1::BaseController
before_filter :authenticate_user!

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::GroupsController < Api::V1::BaseController
before_filter :authenticate_user!

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::IssuesController < Api::V1::BaseController
respond_to :json

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::JobsController < Api::V1::BaseController
# QUEUES = %w(iso_worker_observer publish_observer rpm_worker_observer)
# QUEUE_CLASSES = %w(AbfWorker::IsoWorkerObserver AbfWorker::PublishObserver AbfWorker::RpmWorkerObserver)

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::PlatformsController < Api::V1::BaseController
before_filter :authenticate_user!
skip_before_filter :authenticate_user!, :only => :allowed

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::ProductBuildListsController < Api::V1::BaseController
before_filter :authenticate_user!
skip_before_filter :authenticate_user!, :only => [:index, :show] if APP_CONFIG['anonymous_access']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::ProductsController < Api::V1::BaseController
before_filter :authenticate_user!
skip_before_filter :authenticate_user!, :only => [:index, :show] if APP_CONFIG['anonymous_access']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::ProjectsController < Api::V1::BaseController
before_filter :authenticate_user!

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::PullRequestsController < Api::V1::BaseController
respond_to :json

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::RepositoriesController < Api::V1::BaseController
before_filter :authenticate_user!

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::SearchController < Api::V1::BaseController
before_filter :authenticate_user! unless APP_CONFIG['anonymous_access']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Api::V1::UsersController < Api::V1::BaseController
before_filter :authenticate_user!

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class ApplicationController < ActionController::Base
AIRBRAKE_IGNORE = [ActionController::InvalidAuthenticityToken,
AbstractController::ActionNotFound]

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class AutocompletesController < ApplicationController
before_filter :authenticate_user!

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class ContactsController < ApplicationController
def new

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Groups::BaseController < ApplicationController
before_filter :authenticate_user!
before_filter :find_group

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Groups::MembersController < Groups::BaseController
is_related_controller!
belongs_to :group, :finder => 'find_by_insensitive_uname!', :optional => true

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Groups::ProfileController < Groups::BaseController
include AvatarHelper
load_and_authorize_resource :class => Group, :instance_name => 'group'

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class HomeController < ApplicationController
before_filter :authenticate_user!, :only => [:activity, :issues, :pull_requests]

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class PagesController < ApplicationController
def tour_inside

View File

@ -1,3 +1,2 @@
# -*- encoding : utf-8 -*-
class Platforms::BaseController < ApplicationController
end

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Platforms::MaintainersController < ApplicationController
before_filter :authenticate_user!
skip_before_filter :authenticate_user!, :only => [:index] if APP_CONFIG['anonymous_access']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Platforms::PlatformsController < Platforms::BaseController
include FileStoreHelper

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Platforms::PrivateUsersController < Platforms::BaseController
before_filter :authenticate_user!
before_filter :find_platform_and_private_users

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Platforms::PrivatesController < Platforms::BaseController
require 'digest/sha2'

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Platforms::ProductBuildListsController < Platforms::BaseController
include FileStoreHelper

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Platforms::ProductsController < Platforms::BaseController
include GitHelper
before_filter :authenticate_user!

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Platforms::RepositoriesController < Platforms::BaseController
include FileStoreHelper

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::BaseController < ApplicationController
prepend_before_filter :find_project
before_filter :init_statistics

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::BuildListsController < Projects::BaseController
include FileStoreHelper

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::CollaboratorsController < Projects::BaseController
respond_to :html, :json

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::CommentsController < Projects::BaseController
before_filter :authenticate_user!
load_and_authorize_resource :project

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::CommitSubscribesController < Projects::BaseController
before_filter :authenticate_user!
load_and_authorize_resource :project

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::Git::BaseController < Projects::BaseController
before_filter :authenticate_user!
skip_before_filter :authenticate_user!, :only => [:show, :index, :blame, :raw, :archive, :diff, :tags, :branches] if APP_CONFIG['anonymous_access']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::Git::BlobsController < Projects::Git::BaseController
before_filter :set_blob
before_filter lambda {authorize! :write, @project}, :only => [:edit, :update]

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::Git::CommitsController < Projects::Git::BaseController
def index
if @path.present?

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::Git::TreesController < Projects::Git::BaseController
before_filter lambda{redirect_to @project if params[:treeish] == @project.default_branch and params[:path].blank?}, :only => :show
skip_before_filter :set_branch_and_tree, :set_treeish_and_path, :only => :archive

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::HooksController < Projects::BaseController
before_filter :authenticate_user!
load_and_authorize_resource :project

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::IssuesController < Projects::BaseController
NON_RESTFUL_ACTION = [:create_label, :update_label, :destroy_label]
before_filter :authenticate_user!

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::ProjectsController < Projects::BaseController
include ProjectsHelper
before_filter :authenticate_user!

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::PullRequestsController < Projects::BaseController
before_filter :authenticate_user!
skip_before_filter :authenticate_user!, :only => [:index, :show] if APP_CONFIG['anonymous_access']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Projects::SubscribesController < Projects::BaseController
before_filter :authenticate_user!

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
#require 'lib/gollum'
require 'cgi'

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class SearchController < ApplicationController
before_filter :authenticate_user! unless APP_CONFIG['anonymous_access']
# load_and_authorize_resource

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Users::BaseController < ApplicationController
before_filter :authenticate_user!
before_filter :find_user

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
def facebook
@ -61,4 +60,4 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
return authentication.user
end
end
end

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Users::ProfileController < Users::BaseController
skip_before_filter :authenticate_user!, :only => :show if APP_CONFIG['anonymous_access']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Users::RegisterRequestsController < ApplicationController
before_filter :user_choose_locale
layout 'invite'

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Users::SettingsController < Users::BaseController
include AvatarHelper
before_filter :set_current_user

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Users::SshKeysController < Users::BaseController
skip_before_filter :find_user

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Users::UsersController < Users::BaseController
skip_before_filter :authenticate_user!, :only => [:allowed, :check, :discover]
before_filter :find_user_by_key, :only => [:allowed, :discover]

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module ActivityFeedsHelper
def render_activity_feed(activity_feed)
render activity_feed.partial, activity_feed.data.merge(:activity_feed => activity_feed)

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module AdvisoriesHelper
def advisories_select_options(advisories, opts = {:class => 'popoverable'})
def_values = [[t("layout.advisories.no_"), 'no'], [t("layout.advisories.new"), 'new'], [t("layout.advisories.existing"), 'existing', {:class => 'advisory_id'}]]

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module ApplicationHelper
def layout_class
case

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module BuildListsHelper
# See: app/assets/javascripts/angularjs/models/build_list.js.erb

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module CommentsHelper
def project_commentable_comment_path(project, commentable, comment)
if Comment.issue_comment?(commentable.class)

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module CommitHelper
def render_commit_stats(stats)
res = ["<table class='commit_stats'>"]
@ -18,7 +17,7 @@ module CommitHelper
end
res << "</table>"
res.join("\n").html_safe.default_encoding!
res.join("\n").html_safe
end
# def format_commit_message(message)

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module ContentsHelper
def build_content_paths(platform, path)

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module DeviseHelper
def getDeviseErrors(*name)
res = Array.new(name.count)

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module DiffHelper
def render_diff_stats(stats)
path = @pull.try(:id) ? polymorphic_path([@project, @pull]) : ''
@ -17,7 +16,7 @@ module DiffHelper
end
res << "</table>"
res.join("\n").html_safe.default_encoding!
res.join("\n").html_safe
end
#include Git::Diff::InlineCallback

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module FileStoreHelper
def file_store_results_url(sha1, file_name)

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module GitHelper
def submodule_url(node, treeish)

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module IssuesHelper
def tracker_search_field(name, txt, classes = nil)
str = "<input name='#{name}' id='#{name}' type='text' value='#{txt}'"

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module MassBuildHelper
def link_to_list platform, mass_build, which
link_to t("layout.mass_builds.#{which}"),

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module PaginateHelper
def paginate_params

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module PlatformsHelper
def repository_name_postfix(platform)
return "" unless platform

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module ProjectsHelper
def options_for_filters(all_projects, groups, owners)
projects_count_by_groups = all_projects.where(:owner_id => groups, :owner_type => 'Group').

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module PullRequestHelper
def merge_activity comments, commits
common_comments, pull_comments = comments.partition {|c| c.automatic || c.data.blank?}

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module UsersHelper
def avatar_url_by_email(email, size = :small)

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
module WikiHelper
def revert_path(project, first, second, name)

View File

@ -1,5 +1,3 @@
# -*- encoding : utf-8 -*-
class UserMailer < ActionMailer::Base
add_template_helper ActivityFeedsHelper
add_template_helper CommitHelper

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
# If rules goes one by one CanCan joins them by 'OR' sql operator
# If rule has multiple conditions CanCan joins them by 'AND' sql operator
# WARNING:

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class ActivityFeed < ActiveRecord::Base
CODE = ['git_delete_branch_notification', 'git_new_push_notification', 'new_comment_commit_notification']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Arch < ActiveRecord::Base
DEFAULT = %w[i586 x86_64]

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Authentication < ActiveRecord::Base
belongs_to :user

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Avatar < ActiveRecord::Base
self.abstract_class = true

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class BuildList < ActiveRecord::Base
include Modules::Models::CommitAndVersion
include Modules::Models::FileStoreClean

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class BuildList::Filter
PER_PAGE = [25, 50, 100]

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class BuildList::Item < ActiveRecord::Base
belongs_to :build_list, :touch => true

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Collaborator
include ActiveModel::Conversion
include ActiveModel::Validations

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Comment < ActiveRecord::Base
include Modules::Observers::ActivityFeed::Comment

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class EventLog < ActiveRecord::Base
belongs_to :user
belongs_to :eventable, :polymorphic => true

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class EventLogObserver < ActiveRecord::Observer
observe :user, :private_user, :platform, :repository, :project, :product, :build_list, :product_build_list

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class GitHook
ZERO = '0000000000000000000000000000000000000000'
@queue = :hook

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Group < Avatar
belongs_to :owner, :class_name => 'User'

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Issue < ActiveRecord::Base
include Modules::Observers::ActivityFeed::Issue
STATUSES = ['open', 'closed']

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class KeyPair < ActiveRecord::Base
belongs_to :repository
belongs_to :user

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Label < ActiveRecord::Base
has_many :labelings, :dependent => :destroy
has_many :issues, :through => :labelings

View File

@ -1,4 +1,3 @@
# -*- encoding : utf-8 -*-
class Labeling < ActiveRecord::Base
belongs_to :issue
belongs_to :label

Some files were not shown because too many files have changed in this diff Show More