summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-09-07 14:58:01 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-09-07 14:58:01 +0530
commitf5b9837c19f48255237eca1e618fc632a45b58b5 (patch)
tree2653e9aa1e3bf0a1db6630bb52863c30e6313d87 /config
parent72b9b87ca93615640dcc022f324b2af16ceaa4eb (diff)
parent1d5488699678d22644d24add4b89cede0419ad25 (diff)
downloadgitlab-ce-f5b9837c19f48255237eca1e618fc632a45b58b5.tar.gz
Merge remote-tracking branch 'origin/master' into 21170-cycle-analytics
Diffstat (limited to 'config')
-rw-r--r--config/initializers/sentry.rb1
-rw-r--r--config/routes.rb8
2 files changed, 9 insertions, 0 deletions
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 74fef7cadfe..5892c1de024 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -18,6 +18,7 @@ if Rails.env.production?
# Sanitize fields based on those sanitized from Rails.
config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s)
+ config.tags = { program: Gitlab::Sentry.program_context }
end
end
end
diff --git a/config/routes.rb b/config/routes.rb
index 270c71f1a00..ac056148ab4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -784,6 +784,14 @@ Rails.application.routes.draw do
resources :builds, only: [:index, :show], constraints: { id: /\d+/ } do
collection do
post :cancel_all
+
+ resources :artifacts, only: [] do
+ collection do
+ get :latest_succeeded,
+ path: '*ref_name_and_path',
+ format: false
+ end
+ end
end
member do