[DRE-commits] [gitlab] 04/05: add rails 4.2 with upstream patch
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Thu Nov 26 11:43:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository gitlab.
commit 051a9366218a18353c366128ef20f0d98080999a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Thu Nov 26 17:08:11 2015 +0530
add rails 4.2 with upstream patch
---
debian/patches/0200-rails-4.2.patch | 794 ++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 795 insertions(+)
diff --git a/debian/patches/0200-rails-4.2.patch b/debian/patches/0200-rails-4.2.patch
new file mode 100644
index 0000000..d11a34f
--- /dev/null
+++ b/debian/patches/0200-rails-4.2.patch
@@ -0,0 +1,794 @@
+From 40ff1318d29884e4d17e7e450d8a7633e5ac36a9 Mon Sep 17 00:00:00 2001
+From: Valery Sizov <vsv2711 at gmail.com>
+Date: Wed, 25 Nov 2015 18:18:44 +0200
+Subject: [PATCH] Rails update to 4.2.4
+
+---
+ app/models/sent_notification.rb | 5 ++---
+ app/workers/emails_on_push_worker.rb | 2 +-
+ bin/ci/upgrade.rb | 0
+ bin/rails | 6 +-----
+ bin/rake | 9 +++------
+ bin/setup | 29 +++++++++++++++++++++++++++++
+ bin/upgrade.rb | 0
+ config/environment.rb | 2 +-
+ config/environments/development.rb | 2 +-
+ config/environments/production.rb | 2 +-
+ config/environments/test.rb | 2 +-
+ config/initializers/cookies_serializer.rb | 2 +-
+ config/initializers/default_url_options.rb | 2 +-
+ config/initializers/rack_attack.rb.example | 14 +++++++-------
+ config/initializers/rack_lineprof.rb | 2 +-
+ config/initializers/secret_token.rb | 8 ++++----
+ config/initializers/session_store.rb | 4 ++--
+ config/initializers/sherlock.rb | 2 +-
+ config/initializers/smtp_settings.rb.sample | 2 +-
+ config/initializers/static_files.rb | 2 +-
+ config/routes.rb | 2 +-
+ db/schema.rb | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------
+ 24 files changed, 264 insertions(+), 194 deletions(-)
+ mode change 100644 => 100755 bin/ci/upgrade.rb
+ create mode 100755 bin/setup
+ mode change 100644 => 100755 bin/upgrade.rb
+
+Removed Gemfile and Gemfile.lock changes and refreshed (praveen)
+
+
+Index: gitlab/app/models/sent_notification.rb
+===================================================================
+--- gitlab.orig/app/models/sent_notification.rb
++++ gitlab/app/models/sent_notification.rb
+@@ -17,9 +17,8 @@ class SentNotification < ActiveRecord::B
+ belongs_to :noteable, polymorphic: true
+ belongs_to :recipient, class_name: "User"
+
+- validate :project, :recipient, :reply_key, presence: true
+- validate :reply_key, uniqueness: true
+-
++ validates :project, :recipient, :reply_key, presence: true
++ validates :reply_key, uniqueness: true
+ validates :noteable_id, presence: true, unless: :for_commit?
+ validates :commit_id, presence: true, if: :for_commit?
+ validates :line_code, format: { with: /\A[a-z0-9]+_\d+_\d+\Z/ }, allow_blank: true
+Index: gitlab/app/workers/emails_on_push_worker.rb
+===================================================================
+--- gitlab.orig/app/workers/emails_on_push_worker.rb
++++ gitlab/app/workers/emails_on_push_worker.rb
+@@ -53,7 +53,7 @@ class EmailsOnPushWorker
+ reverse_compare: reverse_compare,
+ send_from_committer_email: send_from_committer_email,
+ disable_diffs: disable_diffs
+- ).deliver
++ ).deliver_now
+ # These are input errors and won't be corrected even if Sidekiq retries
+ rescue Net::SMTPFatalError, Net::SMTPSyntaxError => e
+ logger.info("Failed to send e-mail for project '#{project.name_with_namespace}' to #{recipient}: #{e}")
+Index: gitlab/bin/rails
+===================================================================
+--- gitlab.orig/bin/rails
++++ gitlab/bin/rails
+@@ -1,8 +1,4 @@
+ #!/usr/bin/env ruby
+-begin
+- load File.expand_path("../spring", __FILE__)
+-rescue LoadError
+-end
+-APP_PATH = File.expand_path('../../config/application', __FILE__)
++APP_PATH = File.expand_path('../../config/application', __FILE__)
+ require_relative '../config/boot'
+ require 'rails/commands'
+Index: gitlab/bin/rake
+===================================================================
+--- gitlab.orig/bin/rake
++++ gitlab/bin/rake
+@@ -1,7 +1,4 @@
+ #!/usr/bin/env ruby
+-begin
+- load File.expand_path("../spring", __FILE__)
+-rescue LoadError
+-end
+-require 'bundler/setup'
+-load Gem.bin_path('rake', 'rake')
++require_relative '../config/boot'
++require 'rake'
++Rake.application.run
+Index: gitlab/bin/setup
+===================================================================
+--- /dev/null
++++ gitlab/bin/setup
+@@ -0,0 +1,29 @@
++#!/usr/bin/env ruby
++require 'pathname'
++
++# path to your application root.
++APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
++
++Dir.chdir APP_ROOT do
++ # This script is a starting point to setup your application.
++ # Add necessary setup steps to this file:
++
++ puts "== Installing dependencies =="
++ system "gem install bundler --conservative"
++ system "bundle check || bundle install"
++
++ # puts "\n== Copying sample files =="
++ # unless File.exist?("config/database.yml")
++ # system "cp config/database.yml.sample config/database.yml"
++ # end
++
++ puts "\n== Preparing database =="
++ system "bin/rake db:setup"
++
++ puts "\n== Removing old logs and tempfiles =="
++ system "rm -f log/*"
++ system "rm -rf tmp/cache"
++
++ puts "\n== Restarting application server =="
++ system "touch tmp/restart.txt"
++end
+Index: gitlab/config/environment.rb
+===================================================================
+--- gitlab.orig/config/environment.rb
++++ gitlab/config/environment.rb
+@@ -2,4 +2,4 @@
+ require File.expand_path('../application', __FILE__)
+
+ # Initialize the rails application
+-Gitlab::Application.initialize!
++Rails.application.initialize!
+Index: gitlab/config/environments/development.rb
+===================================================================
+--- gitlab.orig/config/environments/development.rb
++++ gitlab/config/environments/development.rb
+@@ -1,4 +1,4 @@
+-Gitlab::Application.configure do
++Rails.application.configure do
+ # Settings specified here will take precedence over those in config/application.rb
+
+ # In the development environment your application's code is reloaded on
+Index: gitlab/config/environments/production.rb
+===================================================================
+--- gitlab.orig/config/environments/production.rb
++++ gitlab/config/environments/production.rb
+@@ -1,4 +1,4 @@
+-Gitlab::Application.configure do
++Rails.application.configure do
+ # Settings specified here will take precedence over those in config/application.rb
+
+ # Code is not reloaded between requests
+Index: gitlab/config/environments/test.rb
+===================================================================
+--- gitlab.orig/config/environments/test.rb
++++ gitlab/config/environments/test.rb
+@@ -1,4 +1,4 @@
+-Gitlab::Application.configure do
++Rails.application.configure do
+ # Settings specified here will take precedence over those in config/application.rb
+
+ # The test environment is used exclusively to run your application's
+Index: gitlab/config/initializers/cookies_serializer.rb
+===================================================================
+--- gitlab.orig/config/initializers/cookies_serializer.rb
++++ gitlab/config/initializers/cookies_serializer.rb
+@@ -1,3 +1,3 @@
+ # Be sure to restart your server when you modify this file.
+
+-Gitlab::Application.config.action_dispatch.cookies_serializer = :hybrid
++Rails.application.config.action_dispatch.cookies_serializer = :hybrid
+Index: gitlab/config/initializers/default_url_options.rb
+===================================================================
+--- gitlab.orig/config/initializers/default_url_options.rb
++++ gitlab/config/initializers/default_url_options.rb
+@@ -8,4 +8,4 @@ unless Gitlab.config.gitlab_on_standard_
+ default_url_options[:port] = Gitlab.config.gitlab.port
+ end
+
+-Gitlab::Application.routes.default_url_options = default_url_options
++Rails.application.routes.default_url_options = default_url_options
+Index: gitlab/config/initializers/rack_attack.rb.example
+===================================================================
+--- gitlab.orig/config/initializers/rack_attack.rb.example
++++ gitlab/config/initializers/rack_attack.rb.example
+@@ -4,13 +4,13 @@
+ # If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+
+ paths_to_be_protected = [
+- "#{Gitlab::Application.config.relative_url_root}/users/password",
+- "#{Gitlab::Application.config.relative_url_root}/users/sign_in",
+- "#{Gitlab::Application.config.relative_url_root}/api/#{API::API.version}/session.json",
+- "#{Gitlab::Application.config.relative_url_root}/api/#{API::API.version}/session",
+- "#{Gitlab::Application.config.relative_url_root}/users",
+- "#{Gitlab::Application.config.relative_url_root}/users/confirmation",
+- "#{Gitlab::Application.config.relative_url_root}/unsubscribes/"
++ "#{Rails.application.config.relative_url_root}/users/password",
++ "#{Rails.application.config.relative_url_root}/users/sign_in",
++ "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session.json",
++ "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session",
++ "#{Rails.application.config.relative_url_root}/users",
++ "#{Rails.application.config.relative_url_root}/users/confirmation",
++ "#{Rails.application.config.relative_url_root}/unsubscribes/"
+
+ ]
+
+Index: gitlab/config/initializers/rack_lineprof.rb
+===================================================================
+--- gitlab.orig/config/initializers/rack_lineprof.rb
++++ gitlab/config/initializers/rack_lineprof.rb
+@@ -2,7 +2,7 @@
+ # with darker backgrounds. This patch tweaks the colors a bit so the output is
+ # actually readable.
+ if Rails.env.development? and RUBY_ENGINE == 'ruby' and ENV['ENABLE_LINEPROF']
+- Gitlab::Application.config.middleware.use(Rack::Lineprof)
++ Rails.application.config.middleware.use(Rack::Lineprof)
+
+ module Rack
+ class Lineprof
+Index: gitlab/config/initializers/secret_token.rb
+===================================================================
+--- gitlab.orig/config/initializers/secret_token.rb
++++ gitlab/config/initializers/secret_token.rb
+@@ -22,15 +22,15 @@ def find_secure_token
+ end
+ end
+
+-Gitlab::Application.config.secret_token = find_secure_token
+-Gitlab::Application.config.secret_key_base = find_secure_token
++Rails.application.config.secret_token = find_secure_token
++Rails.application.config.secret_key_base = find_secure_token
+
+ # CI
+ def generate_new_secure_token
+ SecureRandom.hex(64)
+ end
+
+-if Gitlab::Application.secrets.db_key_base.blank?
++if Rails.application.secrets.db_key_base.blank?
+ warn "Missing `db_key_base` for '#{Rails.env}' environment. The secrets will be generated and stored in `config/secrets.yml`"
+
+ all_secrets = YAML.load_file('config/secrets.yml') if File.exist?('config/secrets.yml')
+@@ -46,5 +46,5 @@ if Gitlab::Application.secrets.db_key_ba
+ file.write(YAML.dump(all_secrets))
+ end
+
+- Gitlab::Application.secrets.db_key_base = env_secrets['db_key_base']
++ Rails.application.secrets.db_key_base = env_secrets['db_key_base']
+ end
+Index: gitlab/config/initializers/session_store.rb
+===================================================================
+--- gitlab.orig/config/initializers/session_store.rb
++++ gitlab/config/initializers/session_store.rb
+@@ -13,11 +13,11 @@ end
+ unless Rails.env.test?
+ Gitlab::Application.config.session_store(
+ :redis_store, # Using the cookie_store would enable session replay attacks.
+- servers: Gitlab::Application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store
++ servers: Rails.application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store
+ key: '_gitlab_session',
+ secure: Gitlab.config.gitlab.https,
+ httponly: true,
+ expire_after: Settings.gitlab['session_expire_delay'] * 60,
+- path: (Gitlab::Application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root
++ path: (Rails.application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root
+ )
+ end
+Index: gitlab/config/initializers/sherlock.rb
+===================================================================
+--- gitlab.orig/config/initializers/sherlock.rb
++++ gitlab/config/initializers/sherlock.rb
+@@ -1,5 +1,5 @@
+ if Gitlab::Sherlock.enabled?
+- Gitlab::Application.configure do |config|
++ Rails.application.configure do |config|
+ config.middleware.use(Gitlab::Sherlock::Middleware)
+ end
+ end
+Index: gitlab/config/initializers/smtp_settings.rb.sample
+===================================================================
+--- gitlab.orig/config/initializers/smtp_settings.rb.sample
++++ gitlab/config/initializers/smtp_settings.rb.sample
+@@ -8,7 +8,7 @@
+ # If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+
+ if Rails.env.production?
+- Gitlab::Application.config.action_mailer.delivery_method = :smtp
++ Rails.application.config.action_mailer.delivery_method = :smtp
+
+ ActionMailer::Base.smtp_settings = {
+ address: "email.server.com",
+Index: gitlab/config/initializers/static_files.rb
+===================================================================
+--- gitlab.orig/config/initializers/static_files.rb
++++ gitlab/config/initializers/static_files.rb
+@@ -1,4 +1,4 @@
+-app = Gitlab::Application
++app = Rails.application
+
+ if app.config.serve_static_assets
+ # The `ActionDispatch::Static` middleware intercepts requests for static files
+Index: gitlab/config/routes.rb
+===================================================================
+--- gitlab.orig/config/routes.rb
++++ gitlab/config/routes.rb
+@@ -1,7 +1,7 @@
+ require 'sidekiq/web'
+ require 'api/api'
+
+-Gitlab::Application.routes.draw do
++Rails.application.routes.draw do
+ if Gitlab::Sherlock.enabled?
+ namespace :sherlock do
+ resources :transactions, only: [:index, :show] do
+Index: gitlab/db/schema.rb
+===================================================================
+--- gitlab.orig/db/schema.rb
++++ gitlab/db/schema.rb
+@@ -16,7 +16,7 @@ ActiveRecord::Schema.define(version: 201
+ # These are extensions that must be enabled in order to support this database
+ enable_extension "plpgsql"
+
+- create_table "abuse_reports", force: true do |t|
++ create_table "abuse_reports", force: :cascade do |t|
+ t.integer "reporter_id"
+ t.integer "user_id"
+ t.text "message"
+@@ -24,7 +24,7 @@ ActiveRecord::Schema.define(version: 201
+ t.datetime "updated_at"
+ end
+
+- create_table "application_settings", force: true do |t|
++ create_table "application_settings", force: :cascade do |t|
+ t.integer "default_projects_limit"
+ t.boolean "signup_enabled"
+ t.boolean "signin_enabled"
+@@ -51,7 +51,7 @@ ActiveRecord::Schema.define(version: 201
+ t.integer "max_artifacts_size", default: 100, null: false
+ end
+
+- create_table "audit_events", force: true do |t|
++ create_table "audit_events", force: :cascade do |t|
+ t.integer "author_id", null: false
+ t.string "type", null: false
+ t.integer "entity_id", null: false
+@@ -65,7 +65,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "audit_events", ["entity_id", "entity_type"], name: "index_audit_events_on_entity_id_and_entity_type", using: :btree
+ add_index "audit_events", ["type"], name: "index_audit_events_on_type", using: :btree
+
+- create_table "broadcast_messages", force: true do |t|
++ create_table "broadcast_messages", force: :cascade do |t|
+ t.text "message", null: false
+ t.datetime "starts_at"
+ t.datetime "ends_at"
+@@ -76,14 +76,14 @@ ActiveRecord::Schema.define(version: 201
+ t.string "font"
+ end
+
+- create_table "ci_application_settings", force: true do |t|
++ create_table "ci_application_settings", force: :cascade do |t|
+ t.boolean "all_broken_builds"
+ t.boolean "add_pusher"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
+- create_table "ci_builds", force: true do |t|
++ create_table "ci_builds", force: :cascade do |t|
+ t.integer "project_id"
+ t.string "status"
+ t.datetime "finished_at"
+@@ -123,7 +123,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "ci_builds", ["status"], name: "index_ci_builds_on_status", using: :btree
+ add_index "ci_builds", ["type"], name: "index_ci_builds_on_type", using: :btree
+
+- create_table "ci_commits", force: true do |t|
++ create_table "ci_commits", force: :cascade do |t|
+ t.integer "project_id"
+ t.string "ref"
+ t.string "sha"
+@@ -144,7 +144,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "ci_commits", ["project_id"], name: "index_ci_commits_on_project_id", using: :btree
+ add_index "ci_commits", ["sha"], name: "index_ci_commits_on_sha", using: :btree
+
+- create_table "ci_events", force: true do |t|
++ create_table "ci_events", force: :cascade do |t|
+ t.integer "project_id"
+ t.integer "user_id"
+ t.integer "is_admin"
+@@ -157,7 +157,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "ci_events", ["is_admin"], name: "index_ci_events_on_is_admin", using: :btree
+ add_index "ci_events", ["project_id"], name: "index_ci_events_on_project_id", using: :btree
+
+- create_table "ci_jobs", force: true do |t|
++ create_table "ci_jobs", force: :cascade do |t|
+ t.integer "project_id", null: false
+ t.text "commands"
+ t.boolean "active", default: true, null: false
+@@ -174,7 +174,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "ci_jobs", ["deleted_at"], name: "index_ci_jobs_on_deleted_at", using: :btree
+ add_index "ci_jobs", ["project_id"], name: "index_ci_jobs_on_project_id", using: :btree
+
+- create_table "ci_projects", force: true do |t|
++ create_table "ci_projects", force: :cascade do |t|
+ t.string "name"
+ t.integer "timeout", default: 3600, null: false
+ t.datetime "created_at"
+@@ -200,7 +200,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "ci_projects", ["gitlab_id"], name: "index_ci_projects_on_gitlab_id", using: :btree
+ add_index "ci_projects", ["shared_runners_enabled"], name: "index_ci_projects_on_shared_runners_enabled", using: :btree
+
+- create_table "ci_runner_projects", force: true do |t|
++ create_table "ci_runner_projects", force: :cascade do |t|
+ t.integer "runner_id", null: false
+ t.integer "project_id", null: false
+ t.datetime "created_at"
+@@ -210,7 +210,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "ci_runner_projects", ["project_id"], name: "index_ci_runner_projects_on_project_id", using: :btree
+ add_index "ci_runner_projects", ["runner_id"], name: "index_ci_runner_projects_on_runner_id", using: :btree
+
+- create_table "ci_runners", force: true do |t|
++ create_table "ci_runners", force: :cascade do |t|
+ t.string "token"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+@@ -225,7 +225,7 @@ ActiveRecord::Schema.define(version: 201
+ t.string "architecture"
+ end
+
+- create_table "ci_services", force: true do |t|
++ create_table "ci_services", force: :cascade do |t|
+ t.string "type"
+ t.string "title"
+ t.integer "project_id", null: false
+@@ -237,7 +237,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "ci_services", ["project_id"], name: "index_ci_services_on_project_id", using: :btree
+
+- create_table "ci_sessions", force: true do |t|
++ create_table "ci_sessions", force: :cascade do |t|
+ t.string "session_id", null: false
+ t.text "data"
+ t.datetime "created_at"
+@@ -247,7 +247,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "ci_sessions", ["session_id"], name: "index_ci_sessions_on_session_id", using: :btree
+ add_index "ci_sessions", ["updated_at"], name: "index_ci_sessions_on_updated_at", using: :btree
+
+- create_table "ci_taggings", force: true do |t|
++ create_table "ci_taggings", force: :cascade do |t|
+ t.integer "tag_id"
+ t.integer "taggable_id"
+ t.string "taggable_type"
+@@ -260,14 +260,14 @@ ActiveRecord::Schema.define(version: 201
+ add_index "ci_taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "ci_taggings_idx", unique: true, using: :btree
+ add_index "ci_taggings", ["taggable_id", "taggable_type", "context"], name: "index_ci_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
+
+- create_table "ci_tags", force: true do |t|
++ create_table "ci_tags", force: :cascade do |t|
+ t.string "name"
+ t.integer "taggings_count", default: 0
+ end
+
+ add_index "ci_tags", ["name"], name: "index_ci_tags_on_name", unique: true, using: :btree
+
+- create_table "ci_trigger_requests", force: true do |t|
++ create_table "ci_trigger_requests", force: :cascade do |t|
+ t.integer "trigger_id", null: false
+ t.text "variables"
+ t.datetime "created_at"
+@@ -275,7 +275,7 @@ ActiveRecord::Schema.define(version: 201
+ t.integer "commit_id"
+ end
+
+- create_table "ci_triggers", force: true do |t|
++ create_table "ci_triggers", force: :cascade do |t|
+ t.string "token"
+ t.integer "project_id", null: false
+ t.datetime "deleted_at"
+@@ -285,7 +285,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "ci_triggers", ["deleted_at"], name: "index_ci_triggers_on_deleted_at", using: :btree
+
+- create_table "ci_variables", force: true do |t|
++ create_table "ci_variables", force: :cascade do |t|
+ t.integer "project_id", null: false
+ t.string "key"
+ t.text "value"
+@@ -296,14 +296,14 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "ci_variables", ["project_id"], name: "index_ci_variables_on_project_id", using: :btree
+
+- create_table "ci_web_hooks", force: true do |t|
++ create_table "ci_web_hooks", force: :cascade do |t|
+ t.string "url", null: false
+ t.integer "project_id", null: false
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
+- create_table "deploy_keys_projects", force: true do |t|
++ create_table "deploy_keys_projects", force: :cascade do |t|
+ t.integer "deploy_key_id", null: false
+ t.integer "project_id", null: false
+ t.datetime "created_at"
+@@ -312,7 +312,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "deploy_keys_projects", ["project_id"], name: "index_deploy_keys_projects_on_project_id", using: :btree
+
+- create_table "emails", force: true do |t|
++ create_table "emails", force: :cascade do |t|
+ t.integer "user_id", null: false
+ t.string "email", null: false
+ t.datetime "created_at"
+@@ -322,7 +322,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "emails", ["email"], name: "index_emails_on_email", unique: true, using: :btree
+ add_index "emails", ["user_id"], name: "index_emails_on_user_id", using: :btree
+
+- create_table "events", force: true do |t|
++ create_table "events", force: :cascade do |t|
+ t.string "target_type"
+ t.integer "target_id"
+ t.string "title"
+@@ -341,7 +341,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "events", ["target_id"], name: "index_events_on_target_id", using: :btree
+ add_index "events", ["target_type"], name: "index_events_on_target_type", using: :btree
+
+- create_table "forked_project_links", force: true do |t|
++ create_table "forked_project_links", force: :cascade do |t|
+ t.integer "forked_to_project_id", null: false
+ t.integer "forked_from_project_id", null: false
+ t.datetime "created_at"
+@@ -350,7 +350,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "forked_project_links", ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true, using: :btree
+
+- create_table "identities", force: true do |t|
++ create_table "identities", force: :cascade do |t|
+ t.string "extern_uid"
+ t.string "provider"
+ t.integer "user_id"
+@@ -361,7 +361,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "identities", ["created_at", "id"], name: "index_identities_on_created_at_and_id", using: :btree
+ add_index "identities", ["user_id"], name: "index_identities_on_user_id", using: :btree
+
+- create_table "issues", force: true do |t|
++ create_table "issues", force: :cascade do |t|
+ t.string "title"
+ t.integer "assignee_id"
+ t.integer "author_id"
+@@ -386,7 +386,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "issues", ["project_id"], name: "index_issues_on_project_id", using: :btree
+ add_index "issues", ["title"], name: "index_issues_on_title", using: :btree
+
+- create_table "keys", force: true do |t|
++ create_table "keys", force: :cascade do |t|
+ t.integer "user_id"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+@@ -400,7 +400,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "keys", ["created_at", "id"], name: "index_keys_on_created_at_and_id", using: :btree
+ add_index "keys", ["user_id"], name: "index_keys_on_user_id", using: :btree
+
+- create_table "label_links", force: true do |t|
++ create_table "label_links", force: :cascade do |t|
+ t.integer "label_id"
+ t.integer "target_id"
+ t.string "target_type"
+@@ -411,7 +411,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "label_links", ["label_id"], name: "index_label_links_on_label_id", using: :btree
+ add_index "label_links", ["target_id", "target_type"], name: "index_label_links_on_target_id_and_target_type", using: :btree
+
+- create_table "labels", force: true do |t|
++ create_table "labels", force: :cascade do |t|
+ t.string "title"
+ t.string "color"
+ t.integer "project_id"
+@@ -422,7 +422,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "labels", ["project_id"], name: "index_labels_on_project_id", using: :btree
+
+- create_table "lfs_objects", force: true do |t|
++ create_table "lfs_objects", force: :cascade do |t|
+ t.string "oid", null: false
+ t.integer "size", null: false
+ t.datetime "created_at"
+@@ -432,7 +432,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "lfs_objects", ["oid"], name: "index_lfs_objects_on_oid", unique: true, using: :btree
+
+- create_table "lfs_objects_projects", force: true do |t|
++ create_table "lfs_objects_projects", force: :cascade do |t|
+ t.integer "lfs_object_id", null: false
+ t.integer "project_id", null: false
+ t.datetime "created_at"
+@@ -441,7 +441,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "lfs_objects_projects", ["project_id"], name: "index_lfs_objects_projects_on_project_id", using: :btree
+
+- create_table "members", force: true do |t|
++ create_table "members", force: :cascade do |t|
+ t.integer "access_level", null: false
+ t.integer "source_id", null: false
+ t.string "source_type", null: false
+@@ -463,7 +463,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "members", ["type"], name: "index_members_on_type", using: :btree
+ add_index "members", ["user_id"], name: "index_members_on_user_id", using: :btree
+
+- create_table "merge_request_diffs", force: true do |t|
++ create_table "merge_request_diffs", force: :cascade do |t|
+ t.string "state"
+ t.text "st_commits"
+ t.text "st_diffs"
+@@ -474,7 +474,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "merge_request_diffs", ["merge_request_id"], name: "index_merge_request_diffs_on_merge_request_id", unique: true, using: :btree
+
+- create_table "merge_requests", force: true do |t|
++ create_table "merge_requests", force: :cascade do |t|
+ t.string "target_branch", null: false
+ t.string "source_branch", null: false
+ t.integer "source_project_id", null: false
+@@ -506,7 +506,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "merge_requests", ["target_project_id", "iid"], name: "index_merge_requests_on_target_project_id_and_iid", unique: true, using: :btree
+ add_index "merge_requests", ["title"], name: "index_merge_requests_on_title", using: :btree
+
+- create_table "milestones", force: true do |t|
++ create_table "milestones", force: :cascade do |t|
+ t.string "title", null: false
+ t.integer "project_id", null: false
+ t.text "description"
+@@ -522,7 +522,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "milestones", ["project_id", "iid"], name: "index_milestones_on_project_id_and_iid", unique: true, using: :btree
+ add_index "milestones", ["project_id"], name: "index_milestones_on_project_id", using: :btree
+
+- create_table "namespaces", force: true do |t|
++ create_table "namespaces", force: :cascade do |t|
+ t.string "name", null: false
+ t.string "path", null: false
+ t.integer "owner_id"
+@@ -541,7 +541,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "namespaces", ["public"], name: "index_namespaces_on_public", using: :btree
+ add_index "namespaces", ["type"], name: "index_namespaces_on_type", using: :btree
+
+- create_table "notes", force: true do |t|
++ create_table "notes", force: :cascade do |t|
+ t.text "note"
+ t.string "noteable_type"
+ t.integer "author_id"
+@@ -570,7 +570,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "notes", ["project_id"], name: "index_notes_on_project_id", using: :btree
+ add_index "notes", ["updated_at"], name: "index_notes_on_updated_at", using: :btree
+
+- create_table "oauth_access_grants", force: true do |t|
++ create_table "oauth_access_grants", force: :cascade do |t|
+ t.integer "resource_owner_id", null: false
+ t.integer "application_id", null: false
+ t.string "token", null: false
+@@ -583,7 +583,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree
+
+- create_table "oauth_access_tokens", force: true do |t|
++ create_table "oauth_access_tokens", force: :cascade do |t|
+ t.integer "resource_owner_id"
+ t.integer "application_id"
+ t.string "token", null: false
+@@ -598,7 +598,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "oauth_access_tokens", ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", using: :btree
+ add_index "oauth_access_tokens", ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree
+
+- create_table "oauth_applications", force: true do |t|
++ create_table "oauth_applications", force: :cascade do |t|
+ t.string "name", null: false
+ t.string "uid", null: false
+ t.string "secret", null: false
+@@ -613,12 +613,12 @@ ActiveRecord::Schema.define(version: 201
+ add_index "oauth_applications", ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type", using: :btree
+ add_index "oauth_applications", ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
+
+- create_table "project_import_data", force: true do |t|
++ create_table "project_import_data", force: :cascade do |t|
+ t.integer "project_id"
+ t.text "data"
+ end
+
+- create_table "projects", force: true do |t|
++ create_table "projects", force: :cascade do |t|
+ t.string "name"
+ t.string "path"
+ t.text "description"
+@@ -656,7 +656,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "projects", ["path"], name: "index_projects_on_path", using: :btree
+ add_index "projects", ["star_count"], name: "index_projects_on_star_count", using: :btree
+
+- create_table "protected_branches", force: true do |t|
++ create_table "protected_branches", force: :cascade do |t|
+ t.integer "project_id", null: false
+ t.string "name", null: false
+ t.datetime "created_at"
+@@ -666,7 +666,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree
+
+- create_table "releases", force: true do |t|
++ create_table "releases", force: :cascade do |t|
+ t.string "tag"
+ t.text "description"
+ t.integer "project_id"
+@@ -677,7 +677,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "releases", ["project_id", "tag"], name: "index_releases_on_project_id_and_tag", using: :btree
+ add_index "releases", ["project_id"], name: "index_releases_on_project_id", using: :btree
+
+- create_table "sent_notifications", force: true do |t|
++ create_table "sent_notifications", force: :cascade do |t|
+ t.integer "project_id"
+ t.integer "noteable_id"
+ t.string "noteable_type"
+@@ -689,7 +689,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "sent_notifications", ["reply_key"], name: "index_sent_notifications_on_reply_key", unique: true, using: :btree
+
+- create_table "services", force: true do |t|
++ create_table "services", force: :cascade do |t|
+ t.string "type"
+ t.string "title"
+ t.integer "project_id"
+@@ -709,7 +709,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "services", ["project_id"], name: "index_services_on_project_id", using: :btree
+ add_index "services", ["template"], name: "index_services_on_template", using: :btree
+
+- create_table "snippets", force: true do |t|
++ create_table "snippets", force: :cascade do |t|
+ t.string "title"
+ t.text "content"
+ t.integer "author_id", null: false
+@@ -729,7 +729,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "snippets", ["project_id"], name: "index_snippets_on_project_id", using: :btree
+ add_index "snippets", ["visibility_level"], name: "index_snippets_on_visibility_level", using: :btree
+
+- create_table "subscriptions", force: true do |t|
++ create_table "subscriptions", force: :cascade do |t|
+ t.integer "user_id"
+ t.integer "subscribable_id"
+ t.string "subscribable_type"
+@@ -740,7 +740,7 @@ ActiveRecord::Schema.define(version: 201
+
+ add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], name: "subscriptions_user_id_and_ref_fields", unique: true, using: :btree
+
+- create_table "taggings", force: true do |t|
++ create_table "taggings", force: :cascade do |t|
+ t.integer "tag_id"
+ t.integer "taggable_id"
+ t.string "taggable_type"
+@@ -753,14 +753,14 @@ ActiveRecord::Schema.define(version: 201
+ add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true, using: :btree
+ add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
+
+- create_table "tags", force: true do |t|
++ create_table "tags", force: :cascade do |t|
+ t.string "name"
+ t.integer "taggings_count", default: 0
+ end
+
+ add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
+
+- create_table "users", force: true do |t|
++ create_table "users", force: :cascade do |t|
+ t.string "email", default: "", null: false
+ t.string "encrypted_password", default: "", null: false
+ t.string "reset_password_token"
+@@ -826,7 +826,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
+ add_index "users", ["username"], name: "index_users_on_username", using: :btree
+
+- create_table "users_star_projects", force: true do |t|
++ create_table "users_star_projects", force: :cascade do |t|
+ t.integer "project_id", null: false
+ t.integer "user_id", null: false
+ t.datetime "created_at"
+@@ -837,7 +837,7 @@ ActiveRecord::Schema.define(version: 201
+ add_index "users_star_projects", ["user_id", "project_id"], name: "index_users_star_projects_on_user_id_and_project_id", unique: true, using: :btree
+ add_index "users_star_projects", ["user_id"], name: "index_users_star_projects_on_user_id", using: :btree
+
+- create_table "web_hooks", force: true do |t|
++ create_table "web_hooks", force: :cascade do |t|
+ t.string "url"
+ t.integer "project_id"
+ t.datetime "created_at"
diff --git a/debian/patches/series b/debian/patches/series
index 277f478..2d78b77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ loosen-rails-version.patch
0100-remove-development-test.patch
0102-loosen-octokit.patch
0106-loosen-gollum-lib.patch
+0200-rails-4.2.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git
More information about the Pkg-ruby-extras-commits
mailing list