diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-08 16:29:09 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-08 16:29:09 +0200 |
| commit | e7bf943127c9798d55bf59552c55e8400e47b56e (patch) | |
| tree | ed5e859112772a287e12f1a9a548ca6f7614d293 | |
| parent | 722211cddfaeba38f678cc523755af1ce645cb5a (diff) | |
| download | gitlab-ce-e7bf943127c9798d55bf59552c55e8400e47b56e.tar.gz | |
Update Knapsack report only on master
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | db/schema.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ef3081395a..3dc48a89463 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,8 @@ update-knapsack: - scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json - scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json - rm -f knapsack/*_node_*.json + only: + - master # Execute all testing suites diff --git a/db/schema.rb b/db/schema.rb index 69e37470de0..00829d63b66 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,8 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160530150109) do +ActiveRecord::Schema.define(version: 20160603182247) do + # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" enable_extension "pg_trgm" @@ -676,6 +677,7 @@ ActiveRecord::Schema.define(version: 20160530150109) do end add_index "notification_settings", ["source_id", "source_type"], name: "index_notification_settings_on_source_id_and_source_type", using: :btree + add_index "notification_settings", ["user_id", "source_id", "source_type"], name: "index_notifications_on_user_id_and_source_id_and_source_type", unique: true, using: :btree add_index "notification_settings", ["user_id"], name: "index_notification_settings_on_user_id", using: :btree create_table "oauth_access_grants", force: :cascade do |t| |