From c252c03401881fd7dbf7fab984285c402eb31d5f Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Sun, 9 Oct 2016 23:40:58 +0100 Subject: Added raven and raven-vue plugin, updated gon_helper with data needed for raven and created raven_config, required by application.js Added is_production to define sentry environment Removed as much jQuery as possible Added public_sentry_dsn application_settings helper method Use URI module instead of regex for public dsn Removed raven-vue and load raven on if sentry is enabled Add load_script spec added raven_config spec added class_spec_helper and tests added sentry_helper spec added feature spec --- config/application.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index f00e58a36ca..8af6eccf3fe 100644 --- a/config/application.rb +++ b/config/application.rb @@ -92,6 +92,7 @@ module Gitlab config.assets.precompile << "katex.css" config.assets.precompile << "katex.js" config.assets.precompile << "xterm/xterm.css" + config.assets.precompile << "raven.js" config.assets.precompile << "graphs/graphs_bundle.js" config.assets.precompile << "users/users_bundle.js" config.assets.precompile << "network/network_bundle.js" -- cgit v1.2.3 From cfd3d0fd377c3438c6ce8bc2f20b11f86b43a785 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Tue, 4 Apr 2017 14:58:45 +0100 Subject: [ci skip] Remove loadscript class in favour of backend conditional --- config/webpack.config.js | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index 70d98b022c1..62118522606 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -45,6 +45,7 @@ var config = { u2f: ['vendor/u2f'], users: './users/users_bundle.js', vue_pipelines: './vue_pipelines_index/index.js', + raven: './raven/index.js', }, output: { -- cgit v1.2.3 From e22bd9650d7bebfea0909fdaf5be7dcf746b53f7 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 15 Apr 2017 03:38:59 +0100 Subject: Updated specs, added rewire, updated layouts to move conditional raven and gon to head --- config/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index 62118522606..77d703e008a 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -61,7 +61,7 @@ var config = { { test: /\.js$/, exclude: /(node_modules|vendor\/assets)/, - loader: 'babel-loader' + loader: 'babel-loader?plugins=rewire' }, { test: /\.svg$/, -- cgit v1.2.3 From 69e49a095ded719ccfb1287b6100646663de3f03 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 15 Apr 2017 11:52:37 +0100 Subject: Only rewire in dev --- config/webpack.config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index f034a8ae27d..79c1d66a242 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -15,6 +15,7 @@ var DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost'; var DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808; var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false'; var WEBPACK_REPORT = process.env.WEBPACK_REPORT; +var rewirePlugin = IS_PRODUCTION ? '?plugins=rewire' : ''; var config = { context: path.join(ROOT_PATH, 'app/assets/javascripts'), @@ -52,7 +53,7 @@ var config = { vue_pipelines: './vue_pipelines_index/index.js', raven: './raven/index.js', issue_show: './issue_show/index.js', - group: './group.js' + group: './group.js', }, output: { @@ -68,7 +69,7 @@ var config = { { test: /\.js$/, exclude: /(node_modules|vendor\/assets)/, - loader: 'babel-loader?plugins=rewire', + loader: `babel-loader${rewirePlugin}`, }, { test: /\.vue$/, -- cgit v1.2.3 From 86b4f49c8c76a322d2f12f61e5a2d27d3c5c4671 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 15 Apr 2017 12:29:46 +0100 Subject: Removed rewire and fixed tests --- config/webpack.config.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index 79c1d66a242..2153c8bbaf2 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -15,7 +15,6 @@ var DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost'; var DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808; var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false'; var WEBPACK_REPORT = process.env.WEBPACK_REPORT; -var rewirePlugin = IS_PRODUCTION ? '?plugins=rewire' : ''; var config = { context: path.join(ROOT_PATH, 'app/assets/javascripts'), @@ -69,7 +68,7 @@ var config = { { test: /\.js$/, exclude: /(node_modules|vendor\/assets)/, - loader: `babel-loader${rewirePlugin}`, + loader: 'babel-loader', }, { test: /\.vue$/, -- cgit v1.2.3 From 284d4f76fee9f593cb67f3f2978ad4f49ef03c13 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 28 Apr 2017 13:23:34 +0100 Subject: Attempted adding separate clientside_sentry settings --- config/application.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index f2ecc4ce77c..0ab8a24a5df 100644 --- a/config/application.rb +++ b/config/application.rb @@ -55,6 +55,7 @@ module Gitlab # - Webhook URLs (:hook) # - GitLab-shell secret token (:secret_token) # - Sentry DSN (:sentry_dsn) + # - Clientside Sentry DSN (:clientside_sentry_dsn) # - Deploy keys (:key) config.filter_parameters += %i( authentication_token @@ -71,6 +72,7 @@ module Gitlab runners_token secret_token sentry_dsn + clientside_sentry_dsn variables ) -- cgit v1.2.3 From 97633d561681a5c0f55472c1372bedca5fe3bffe Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 28 Apr 2017 16:01:22 +0100 Subject: Fixed specs --- config/application.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index 0ab8a24a5df..46652637c1f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -72,6 +72,7 @@ module Gitlab runners_token secret_token sentry_dsn + clientside_sentry_enabled clientside_sentry_dsn variables ) -- cgit v1.2.3 From dac3b6a4164c77bb142ec1644ed7c697c5c69459 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 4 May 2017 17:21:27 +0100 Subject: Review changes, removed api/v3 updates as its frozen, removed the clientside_sentry properties from the sensitive data filter as they\'re both available publically --- config/application.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index 46652637c1f..f2ecc4ce77c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -55,7 +55,6 @@ module Gitlab # - Webhook URLs (:hook) # - GitLab-shell secret token (:secret_token) # - Sentry DSN (:sentry_dsn) - # - Clientside Sentry DSN (:clientside_sentry_dsn) # - Deploy keys (:key) config.filter_parameters += %i( authentication_token @@ -72,8 +71,6 @@ module Gitlab runners_token secret_token sentry_dsn - clientside_sentry_enabled - clientside_sentry_dsn variables ) -- cgit v1.2.3