[issue #64] Merge branch 'master' into 64-project_wiki

Conflicts:
	Gemfile.lock
	config/locales/en.yml
	db/schema.rb

.gitignore

@@ -12,6 +12,5 @@ public/assets/*
 config/initializers/local.rb
 public/system/*
 public/downloads/*
-.rvmrc
 *.swp
 *.tmproj

Gemfile

@@ -36,7 +36,7 @@ gem "gollum", "1.3.1"
 gem "redcarpet", "1.17.2"
 gem 'creole'
 gem 'rdiscount'
-gem 'org-ruby'
+#gem 'org-ruby'
 gem 'RedCloth'
 gem 'wikicloth'
 
@@ -61,7 +61,7 @@ group :development do
   gem 'ruby_parser'
 
   # debug
-  gem 'ruby-debug'
+  # gem 'ruby-debug19', :require => 'ruby-debug', :platforms => :mri_19
   # gem 'looksee'
   # gem 'awesome_print'
 #  gem 'wirble'

Gemfile.lock

@@ -63,7 +63,6 @@ GEM
     capistrano_colors (0.5.5)
     chronic (0.6.6)
     cocaine (0.2.1)
-    columnize (0.3.5)
     creole (0.4.2)
     daemons (1.1.4)
     delayed_job (2.1.4)
@@ -110,8 +109,6 @@ GEM
       yui-compressor (>= 0.9.3)
     json (1.6.3)
     kgio (2.6.0)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -136,8 +133,6 @@ GEM
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
-    org-ruby (0.6.0)
-      rubypants (>= 0.2.0)
     orm_adapter (0.0.5)
     paperclip (2.5.0)
       activerecord (>= 2.3.0)
@@ -169,14 +164,11 @@ GEM
     rails3-jquery-autocomplete (1.0.4)
       rails (~> 3.0)
     railties (3.0.11)
-      actionpack (= 3.0.11)
-      activesupport (= 3.0.11)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     raindrops (0.8.0)
     rake (0.9.2.2)
-    rbx-require-relative (0.0.5)
     rdiscount (1.6.8)
     rdoc (3.11)
       json (~> 1.4)
@@ -195,15 +187,9 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.7.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     ruby-openid (2.1.8)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    rubypants (0.2.0)
     russian (0.6.0)
       i18n (>= 0.5.0)
     sanitize (2.0.3)
@@ -269,7 +255,6 @@ DEPENDENCIES
   newrelic_rpm
   omniauth (~> 1.0.1)
   omniauth-openid (~> 1.0.1)
-  org-ruby
   paperclip (~> 2.5)
   pg (~> 0.11.0)
   rails (= 3.0.11)
@@ -280,7 +265,6 @@ DEPENDENCIES
   redcarpet (= 1.17.2)
   rr
   rspec-rails (~> 2.7.0)
-  ruby-debug
   ruby_parser
   russian
   schema_plus (~> 0.2.1)

app/controllers/application_controller.rb

@@ -1,4 +1,4 @@
-# coding: UTF-8
+# -*- encoding : utf-8 -*-
 class ApplicationController < ActionController::Base
   protect_from_forgery
 

app/controllers/auto_build_lists_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class AutoBuildListsController < ApplicationController
   before_filter :authenticate_user!, :except => :auto_build
   before_filter :find_auto_build_list, :only => :destroy

app/controllers/build_lists_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class BuildListsController < ApplicationController
   CALLBACK_ACTIONS = [:publish_build, :status_build, :pre_build, :post_build, :circle_build, :new_bbdt]
   NESTED_ACTIONS = [:index, :new, :create]
@@ -39,7 +40,7 @@ class BuildListsController < ApplicationController
     Arch.where(:id => params[:arches]).each do |arch|
       Platform.main.where(:id => params[:bpls]).each do |bpl|
         @build_list = @project.build_lists.build(params[:build_list])
-        @build_list.commit_hash = @project.git_repository.commits(@build_list.project_version.match(/(.+)_latest$/).to_a.last || @build_list.project_version).first.id
+        @build_list.commit_hash = @project.git_repository.commits(@build_list.project_version.match(/^latest_(.+)/).to_a.last || @build_list.project_version).first.id
         @build_list.bpl = bpl; @build_list.arch = arch; @build_list.user = current_user
         flash_options = {:project_version => @build_list.project_version, :arch => arch.name, :bpl => bpl.name, :pl => @build_list.pl}
         if @build_list.save

app/controllers/categories_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class CategoriesController < ApplicationController
   before_filter :authenticate_user!
   before_filter :find_category, :only => [:show, :edit, :update, :destroy]

app/controllers/collaborators_controller.rb

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

app/controllers/comments_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class CommentsController < ApplicationController
   before_filter :authenticate_user!
   before_filter :set_commentable, :only => [:index, :edit, :create, :update, :destroy]

app/controllers/containers_controller.rb

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

app/controllers/downloads_controller.rb

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

app/controllers/event_logs_controller.rb

@@ -1,4 +1,4 @@
-# coding: UTF-8
+# -*- encoding : utf-8 -*-
 class EventLogsController < ApplicationController
   before_filter :authenticate_user!
   load_and_authorize_resource

app/controllers/git/base_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Git::BaseController < ApplicationController
   before_filter :authenticate_user!
 
@@ -39,4 +40,4 @@ class Git::BaseController < ApplicationController
     def set_current_branch
       @current_branch = @branches.select{|b| b.name == @treeish }.first
     end
-end
+end

app/controllers/git/blobs_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Git::BlobsController < Git::BaseController
   before_filter :set_path
   before_filter :set_commit_hash

app/controllers/git/commits_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Git::CommitsController < Git::BaseController
 
   def index

app/controllers/git/repositories_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Git::RepositoriesController < Git::BaseController
 
   def show
@@ -7,4 +8,4 @@ class Git::RepositoriesController < Git::BaseController
     render :template => "git/repositories/empty" unless @tree
   end
 
-end
+end

app/controllers/git/trees_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Git::TreesController < Git::BaseController
 
   def show
@@ -13,4 +14,4 @@ class Git::TreesController < Git::BaseController
 
     render :template => "git/repositories/show"
   end
-end
+end

app/controllers/groups_controller.rb

@@ -1,4 +1,4 @@
-# coding: UTF-8
+# -*- encoding : utf-8 -*-
 class GroupsController < ApplicationController
   is_related_controller!
 

app/controllers/issues_controller.rb

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

app/controllers/members_controller.rb

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

app/controllers/personal_repositories_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class PersonalRepositoriesController < ApplicationController
   before_filter :authenticate_user!
   before_filter :find_repository#, :only => [:show, :destroy, :add_project, :remove_project, :make_private, :settings]

app/controllers/platforms_controller.rb

@@ -1,4 +1,4 @@
-# coding: UTF-8
+# -*- encoding : utf-8 -*-
 class PlatformsController < ApplicationController
   before_filter :authenticate_user!, :except => :easy_urpmi
   before_filter :find_platform, :only => [:freeze, :unfreeze, :clone, :edit, :destroy]

app/controllers/private_users_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class PrivateUsersController < ApplicationController
   before_filter :authenticate_user!
   before_filter :find_platform_and_private_users
@@ -13,7 +14,7 @@ class PrivateUsersController < ApplicationController
   	
   	@pair = PrivateUser.generate_pair(params[:platform_id], current_user.id)
   	@urpmi_list = @platform.urpmi_list(request.host, @pair)
-    redirect_to platform_private_users_path(params[:platform_id]), :notice => "Логин: #{@pair[:login]} Пароль: #{@pair[:pass]}"
+    redirect_to platform_private_users_path(params[:platform_id]), :notice => I18n.t('flash.private_users', :login => @pair[:login], :password => @pair[:pass])
   end
 
   #def destroy

app/controllers/privates_controller.rb

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

app/controllers/product_build_lists_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class ProductBuildListsController < ApplicationController
   before_filter :authenticate_user!, :except => [:status_build]
   load_and_authorize_resource :platform, :only => [:create]

app/controllers/products_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class ProductsController < ApplicationController
   before_filter :authenticate_user!
   before_filter :find_product, :only => [:show, :edit, :update, :destroy]

app/controllers/projects_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class ProjectsController < ApplicationController
   is_related_controller!
 

app/controllers/repositories_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class RepositoriesController < ApplicationController
   before_filter :authenticate_user!
   before_filter :find_repository, :except => [:index, :new, :create]

app/controllers/rpc_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class RpcController < ApplicationController
   exposes_xmlrpc_methods
 
@@ -11,30 +12,30 @@ class RpcController < ApplicationController
   # client.call("project_versions", 1)
 
   def platforms
-    ActiveSupport::Notifications.instrument("event_log.observer", :message => 'список платформ')
+    ActiveSupport::Notifications.instrument "event_log.observer", :message => I18n.t('event_log.notices.platforms_list')
     Platform.select('name').where("platform_type = ?", 'main').map(&:name)
   end
 
   def user_projects
-    ActiveSupport::Notifications.instrument("event_log.observer", :message => 'список пользовательских проектов')
+    ActiveSupport::Notifications.instrument "event_log.observer", :message => I18n.t('event_log.notices.users_list')
     current_user.projects.map{|p| { :id => p.id, :name => p.name } }
   end
 
   def project_versions id
     p = Project.find_by_id(id)
-    ActiveSupport::Notifications.instrument("event_log.observer", :object => p, :message => "список версий")
+    ActiveSupport::Notifications.instrument "event_log.observer", :object => p, :message => I18n.t('event_log.notices.versions_list')
-    p.project_versions.collect {|tag| tag.name.gsub(/^\w+\./, "")} rescue 'not found'
+    p.tags.map(&:name) rescue 'not found'
   end
 
   def build_status id
     bl = BuildList.find_by_id(id)
-    ActiveSupport::Notifications.instrument("event_log.observer", :object => bl, :message => 'статус сборки')
+    ActiveSupport::Notifications.instrument "event_log.observer", :object => bl, :message => I18n.t('event_log.notices.status')
     bl.try(:status) || 'not found'
   end
 
   def build_packet project_id, repo_id
     # p = Project.find_by_id(project_id); r = Repository.find_by_id(repo_id)
-    ActiveSupport::Notifications.instrument("event_log.observer", :message => 'сборка пакета')
+    ActiveSupport::Notifications.instrument "event_log.observer", :message => I18n.t('event_log.notices.project_build')
     'unknown' # TODO: build packet
   end
 end

app/controllers/settings/notifiers_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Settings::NotifiersController < ApplicationController
   layout "sessions"
 

app/controllers/subscribes_controller.rb

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

app/controllers/users/omniauth_callbacks_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def open_id
     # raise env['omniauth.auth'].inspect

app/controllers/users_controller.rb

@@ -1,4 +1,4 @@
-# coding: UTF-8
+# -*- encoding : utf-8 -*-
 class UsersController < ApplicationController
   before_filter :authenticate_user!
   before_filter :find_user, :only => [:show, :edit, :update, :destroy]

app/helpers/application_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module ApplicationHelper
   def choose_title
     title = if ['categories', 'personal_repositories', 'downloads'].include?(controller.controller_name)

app/helpers/comments_helper.rb

@@ -1,2 +1,3 @@
+# -*- encoding : utf-8 -*-
 module CommentsHelper
 end

app/helpers/commit_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module CommitHelper
 
   def render_commit_stats(stats)
@@ -36,4 +37,4 @@ module CommitHelper
     truncate(message, :length => 42, :omission => "...")
   end
 
-end
+end

app/helpers/diff_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module DiffHelper
 
   def render_diff(diff)
@@ -14,4 +15,4 @@ module DiffHelper
     res.html_safe
   end
 
-end
+end

app/helpers/git_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module GitHelper
 
   def render_path

app/helpers/issues_helper.rb

@@ -1,2 +1,3 @@
+# -*- encoding : utf-8 -*-
 module IssuesHelper
 end

app/helpers/platforms_helper.rb

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

app/helpers/projects_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module ProjectsHelper
   def git_repo_url(name)
     if current_user

app/helpers/settings/notifiers_helper.rb

@@ -1,2 +1,3 @@
+# -*- encoding : utf-8 -*-
 module Settings::NotifiersHelper
 end

app/helpers/subscribes_helper.rb

@@ -1,2 +1,3 @@
+# -*- encoding : utf-8 -*-
 module SubscribesHelper
 end

app/mailers/user_mailer.rb

@@ -1,4 +1,4 @@
-# coding: UTF-8
+# -*- encoding : utf-8 -*-
 
 class UserMailer < ActionMailer::Base
   default :from => APP_CONFIG['do-not-reply-email']

app/models/ability.rb

@@ -1,3 +1,4 @@
+# -*- 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:

app/models/arch.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Arch < ActiveRecord::Base
   has_many :build_lists, :dependent => :destroy
 

app/models/authentication.rb

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

app/models/auto_build_list.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class AutoBuildList < ActiveRecord::Base
   belongs_to :project
   belongs_to :arch

app/models/build_list.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class BuildList < ActiveRecord::Base
   belongs_to :project
   belongs_to :arch

app/models/build_list/filter.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class BuildList::Filter
   def initialize(project, options = {})
     @project = project
@@ -73,4 +74,4 @@ class BuildList::Filter
       nil
     end
   end
-end
+end

app/models/build_list/item.rb

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

app/models/category.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Category < ActiveRecord::Base
   has_many :projects, :dependent => :nullify
 

app/models/comment.rb

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

app/models/container.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Container < ActiveRecord::Base
   belongs_to :project
   belongs_to :owner, :class_name => 'User', :foreign_key => 'owner_id'

app/models/download.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Download < ActiveRecord::Base
   PREV_LOG_FILE = "#{ APP_CONFIG['nginx_log'] }.0"
 

app/models/event_log.rb

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

app/models/event_log_observer.rb

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

app/models/git/repository.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Git::Repository
   delegate :commits, :commit, :tree, :tags, :heads, :commit_count, :log, :branches, :to => :repo
 
@@ -37,4 +38,4 @@ class Git::Repository
     [commits(treeish, options[:per_page], skip), options[:page], last_page]
   end
 
-end
+end

app/models/group.rb

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

app/models/issue.rb

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

app/models/platform.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #require 'lib/build_server.rb'
 class Platform < ActiveRecord::Base
   VISIBILITIES = ['open', 'hidden']

app/models/private_user.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class PrivateUser < ActiveRecord::Base
   require 'digest/sha2'
   require 'active_support/secure_random'

app/models/product.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Product < ActiveRecord::Base
   ATTRS_TO_CLONE = [ 'build_path', 'build_script', 'counter', 'ks', 'menu', 'tar', 'use_cron', 'cron_tab' ]
 

app/models/product_build_list.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class ProductBuildList < ActiveRecord::Base
   BUILD_STARTED = 2
   BUILD_COMPLETED = 0

app/models/project.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Project < ActiveRecord::Base
   VISIBILITIES = ['open', 'hidden']
   MAX_OWN_PROJECTS = 32000
@@ -54,7 +55,7 @@ class Project < ActiveRecord::Base
         :pl => auto_build_list.pl,
         :bpl => auto_build_list.bpl,
         :arch => auto_build_list.arch,
-        :project_version => collected_project_versions.last,
+        :project_version => versions.last,
         :build_requires => true,
         :update_type => 'bugfix') unless build_lists.for_creation_date_period(Time.current - 15.seconds, Time.current).present?
     end
@@ -75,16 +76,6 @@ class Project < ActiveRecord::Base
     end
   end
 
-  # TODO deprecate and remove project_versions and collected_project_versions ?
-  def project_versions
-    res = tags.select{|tag| tag.name =~ /^v\./}
-    return res if res and res.size > 0
-    tags
-  end
-  def collected_project_versions
-    project_versions.collect{|tag| tag.name.gsub(/^\w+\./, "")}
-  end
-
   def tags
     self.git_repository.tags #.sort_by{|t| t.name.gsub(/[a-zA-Z.]+/, '').to_i}
   end

app/models/project_import.rb

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

app/models/project_to_repository.rb

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

app/models/relation.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Relation < ActiveRecord::Base
   belongs_to :target, :polymorphic => true
   belongs_to :object, :polymorphic => true

app/models/repository.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Repository < ActiveRecord::Base
   belongs_to :platform
   belongs_to :owner, :polymorphic => true

app/models/rpm.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Rpm < ActiveRecord::Base
   belongs_to :arch
   belongs_to :project

app/models/settings.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Settings
   def self.table_name_prefix
     'settings_'

app/models/settings/notifier.rb

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

app/models/subscribe.rb

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

app/models/user.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class User < ActiveRecord::Base
   ROLES = ['admin']
   LANGUAGES_FOR_SELECT = [['Russian', 'ru'], ['English', 'en']]

app/views/git/commits/show.html.haml

@@ -14,7 +14,9 @@
     .content
       .inner
         .patch_and_diff
-          #{link_to "raw diff", commit_path(@project, @commit.id, :diff)} | #{link_to "patch", commit_path(@project, @commit.id, :patch)}
+          = link_to "raw diff", commit_path(@project, @commit.id, :diff)
+          \|
+          = link_to "patch", commit_path(@project, @commit.id, :patch)
         .clear
         = render_commit_stats(@commit.stats)
 

app/views/personal_repositories/_proj_list1.html.haml

@@ -4,7 +4,8 @@
     %th.last  
   - @projects.each do |project|
     %tr{:class => cycle("odd", "even")}
-      %td
+      %td= link_to project.name, project_path(project)
-        = link_to project.name, project_path(project)
       %td.last
-        #{link_to t("layout.show"), project_path(project)} | #{link_to t("layout.delete"), url_for (:action => :remove_project, :project_id => project.id), :confirm => t("layout.projects.confirm_delete")}
+        = link_to t("layout.show"), project_path(project)
+        \|
+        = link_to t("layout.delete"), url_for(:action => :remove_project, :project_id => project.id), :confirm => t("layout.projects.confirm_delete")

app/views/repositories/_proj_list1.html.haml

@@ -7,4 +7,6 @@
       %td
         = link_to project.name, project_path(project)
       %td.last
-        #{link_to t("layout.show"), project_path(project)} | #{link_to t("layout.delete"), url_for (:action => :remove_project, :project_id => project.id), :confirm => t("layout.projects.confirm_delete")}
+        = link_to t("layout.show"), project_path(project)
+        \|
+        = link_to t("layout.delete"), url_for(:action => :remove_project, :project_id => project.id), :confirm => t("layout.projects.confirm_delete")

bin/import_srpm.sh

@@ -32,8 +32,9 @@ rm -f srpm.cpio
 
 # Commit and push changes
 git add -A .
-git commit -m "Automatic import for version $version" 
+git commit -m "Automatic import for version $version"
-git push origin HEAD
+git branch $git_branch # Ensure branch exists
+git push origin master $git_branch
 
 # Cleanup
 rm -rf $tmp_dir

bin/xml-client-demo.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
 require 'rubygems'
@@ -34,4 +35,4 @@ project_id = 1    # FIXME
 repo_id = 1       # FIXME
 pp client.call("build_packet", project_id, repo_id)
 
-puts 'DONE'
+puts 'DONE'

config/application.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'

config/boot.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.

config/compass.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # This configuration file works with both the Compass command line tool and within Rails.
 # Require any additional compass plugins here.
 
@@ -12,4 +13,4 @@ sass_dir = "app/stylesheets"
 javascripts_dir = "public/javascripts"
 
 http_stylesheets_path = "/stylesheets"
-http_javascripts_path = "/javascripts"
+http_javascripts_path = "/javascripts"

config/deploy.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 $:.unshift(File.expand_path('./lib', ENV['rvm_path']))
 set :rvm_type, :user
 
@@ -27,9 +28,9 @@ set :scm, :git
 set :repository,  "git@github.com:warpc/rosa-build.git"
 set :deploy_via,  :remote_cache
 
-require 'lib/recipes/nginx'
+require './lib/recipes/nginx'
-require 'lib/recipes/unicorn'
+require './lib/recipes/unicorn'
-require 'lib/recipes/bluepill'
+require './lib/recipes/bluepill'
 
 namespace :deploy do
   task :stub_xml_rpc do

config/deploy/pingwinsoft.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 set :branch, "pingwinsoft"
 
 set :domain, "b.pingwinsoft.ru" # "195.19.76.12"

config/environment.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 

config/environments/development.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Rosa::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 

config/environments/production.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Rosa::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 

config/environments/test.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Rosa::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 

config/initializers/backtrace_silencers.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

config/initializers/default_product_files.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 DEFAULT_KS = <<-eos
 timezone Europe/Moscow
 auth --useshadow --enablemd5

config/initializers/generators.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Rails.application.config.generators do |g|
     g.test_framework = :rspec
 end

config/initializers/inflections.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format

config/initializers/load_config.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 APP_CONFIG = YAML.load_file("#{Rails.root}/config/application.yml")[Rails.env]
 
 require 'modules'

config/initializers/mime_types.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:
@@ -5,4 +6,4 @@
 # Mime::Type.register_alias "text/html", :iphone
 
 Mime::Type.register "text/plain", :diff
-Mime::Type.register "text/plain", :patch
+Mime::Type.register "text/plain", :patch

config/initializers/notifications.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Warden::Manager.after_authentication do |user,auth,opts| # after_set_user, :except => fetch
   ActiveSupport::Notifications.instrument("event_log.observer", :object => user)
 end

config/initializers/render_errors_in_forms.rb

@@ -1,7 +1,8 @@
+# -*- encoding : utf-8 -*-
 ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
   if html_tag =~ /<label/
     %|<div class="fieldWithErrors">#{html_tag} <span class="error">#{[instance.error_message].join(', ')}</span></div>|.html_safe
   else
     html_tag
   end
-end
+end

config/initializers/session_store.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Be sure to restart your server when you modify this file.
 
 Rosa::Application.config.session_store :cookie_store, :key => '_rosa_session'

config/locales/en.yml

@@ -580,7 +580,16 @@ en:
       download: Statistics
       auto_build_list: Auto rebuild list
       settings:
-        notifier: Notifies setting
+        saved: Settings saved success
+        save_error: Setting update error
+
+      private_users: "Login: %{login} Password: %{password}"
+
+      subscribe:
+        saved: Subscription on notifications for this task is created
+        destroyed: Subscription on notifications for this task is cleaned
+
+      exception_message: Access violation to this page!
 
     attributes:
       settings:

config/locales/event_log.en.yml

@@ -0,0 +1,50 @@
+en:
+  event_log:
+    controllers:
+      products_controller: 'Product Management'
+      platforms_controller: 'Management of platforms'
+      repositories_controller: 'Manage Repositories'
+      projects_controller: 'Project Management'
+      build_lists_controller: 'Management index chart'
+      auto_build_lists_controller: 'Control automatic build'
+      product_build_lists_controller: 'Build management products'
+      'devise/registrations_controller': 'User Registration'
+      'devise/sessions_controller': 'User Authentication'
+      'devise/passwords_controller': 'password recovery'
+      'users/omniauth_callbacks_controller': 'External authentication of users'
+      rpc_controller: 'XML RPC'
+      private_users_controller: 'access to private repositories'
+      personal_repositories_controller: 'Managing personal repositories'
+    actions:
+      'devise/sessions_controller':
+        create: 'input'
+        destroy: 'exit'
+      'users/omniauth_callbacks_controller':
+        open_id: 'login via OpenID'
+      projects_controller:
+        auto_build: 'sent to the automatic assembly'
+      build_lists_controller:
+        create: 'sent to assembly'
+        cancel: 'assembly abolished'
+        publish: 'assembly issued'
+      auto_build_lists_controller:
+        create: 'assigned'
+        destroy: 'canceled'
+      product_build_lists_controller:
+        create: 'sent to assembly'
+      rpc_controller:
+        xe_index: inquiry
+      private_users_controller:
+        create: 'given'
+        destroy: 'deleted'
+      personal_repositories_controller:
+        change_visibility: 'status change'
+      create: 'created'
+      update: 'updated'
+      destroy: 'deleted'
+    notices:
+      platforms_list: a list of platforms
+      users_list: list of custom projects
+      versions_list: version list
+      status: the status of the assembly
+      project_build: build package

config/locales/event_log.ru.yml

@@ -42,3 +42,9 @@ ru:
       create: 'создано'
       update: 'обновлено'
       destroy: 'удалено'
+    notices:
+      platforms_list: список платформ
+      users_list: список пользовательских проектов
+      versions_list: список версий
+      status: статус сборки
+      project_build: сборка пакета