#794: merge master into the branch

app/models/build_list.rb

@@ -327,7 +327,7 @@ class BuildList < ActiveRecord::Base
         arch.name,
         (save_to_platform_id == build_for_platform_id ? '' : build_for_platform.name),
         update_type,
-        build_requires,
+        false,
         id,
         include_repos,
         priority,
@@ -451,7 +451,6 @@ class BuildList < ActiveRecord::Base
       :git_project_address => project.git_project_address(user),
       # :commit_hash => 'fbb2549e44d97226fea6748a4f95d1d82ffb8726',
       :commit_hash => commit_hash,
-      :build_requires => build_requires,
       :include_repos => include_repos_hash,
       :bplname => build_for_platform.name,
       :user => {:uname => user.uname, :email => user.email}

app/models/project.rb

@@ -143,7 +143,6 @@ class Project < ActiveRecord::Base
       bl.update_type = 'newpackage'
       bl.arch = arch
       bl.project_version = "latest_#{platform.name}"
-      bl.build_requires = false # already set as db default
       bl.user = user
       bl.auto_publish = auto_publish
       bl.include_repos = build_reps_ids

app/views/api/v1/build_lists/show.json.jbuilder

@@ -1,6 +1,6 @@
 json.build_list do |json|
   json.(@build_list, :id, :name, :container_path, :status, :duration)
-  json.(@build_list, :is_circle, :update_type, :build_requires, :priority)
+  json.(@build_list, :is_circle, :update_type, :priority)
   json.(@build_list, :advisory, :mass_build)
   json.(@build_list, :auto_publish, :package_version, :commit_hash, :last_published_commit_hash)
   json.build_log_url log_build_list_path(@build_list)

app/views/projects/build_lists/new.html.haml

@@ -26,9 +26,6 @@
     .both
       = f.check_box :auto_publish
       = f.label :auto_publish
-    .both
-      = f.check_box :build_requires
-      = f.label :build_requires
     .both
       = f.check_box :new_core
       = f.label :new_core

app/views/projects/build_lists/show.html.haml

@@ -41,9 +41,6 @@
     - else
       = @build_list.update_type
   .both
-  .leftlist= t("activerecord.attributes.build_list.build_requires")
-  .rightlist= t("layout.#{@build_list.build_requires}_")
-  .both
   .leftlist= t("activerecord.attributes.build_list.auto_publish")
   .rightlist= t("layout.#{@build_list.auto_publish}_")
   .both

config/locales/models/build_list.en.yml

@@ -22,7 +22,6 @@ en:
         save_to_repository: Save to repository
         build_for_platform: Build for platform
         update_type: Update type
-        build_requires: Build with all the required packages
         auto_publish: Automated publising
         project_version: Version
         user: User

config/locales/models/build_list.ru.yml

@@ -22,7 +22,6 @@ ru:
         save_to_repository: Сохранить в репозиторий
         build_for_platform: Собрано для платформы
         update_type: Критичность обновления
-        build_requires: Пересборка с зависимостями
         auto_publish: Автоматическая публикация
         project_version: Версия
         user: Пользователь

db/migrate/20121224125838_remove_build_requires_from_build_list.rb

@@ -0,0 +1,9 @@
+class RemoveBuildRequiresFromBuildList < ActiveRecord::Migration
+  def up
+    remove_column :build_lists, :build_requires
+  end
+
+  def down
+    add_column :build_lists, :build_requires, :boolean, :default => false
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121219122905) do
+ActiveRecord::Schema.define(:version => 20121224125838) do
 
   create_table "activity_feeds", :force => true do |t|
     t.integer  "user_id",    :null => false
@@ -115,7 +115,6 @@ ActiveRecord::Schema.define(:version => 20121219122905) do
     t.boolean  "is_circle",                  :default => false
     t.text     "additional_repos"
     t.string   "name"
-    t.boolean  "build_requires",             :default => false
     t.string   "update_type"
     t.integer  "build_for_platform_id"
     t.integer  "save_to_platform_id"

spec/factories/build_lists.rb

@@ -12,7 +12,6 @@ FactoryGirl.define do
     association :arch
     build_for_platform {|bl| bl.save_to_platform}
     save_to_repository {|bl| bl.save_to_platform.repositories.first}
-    build_requires true
     update_type 'security'
     include_repos {|bl| bl.save_to_platform.repositories.map(&:id)}
     project_version 'latest_master'