Refresh
This commit is contained in:
parent
d808028c80
commit
b918168f98
2 changed files with 7 additions and 7 deletions
|
@ -1,8 +1,8 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -420,9 +420,9 @@
|
||||
@@ -421,9 +421,9 @@
|
||||
# Gitaly GRPC protocol definitions
|
||||
gem 'gitaly', '~> 1.70'
|
||||
gem 'gitaly', '~> 1.73'
|
||||
|
||||
-gem 'grpc', '~> 1.24'
|
||||
+gem 'grpc', '~> 1.19'
|
||||
|
|
10
debian/patches/0740-use-packaged-modules.patch
vendored
10
debian/patches/0740-use-packaged-modules.patch
vendored
|
@ -1,14 +1,14 @@
|
|||
--- a/config/webpack.config.js
|
||||
+++ b/config/webpack.config.js
|
||||
@@ -5,7 +5,6 @@
|
||||
@@ -6,7 +6,6 @@
|
||||
const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
|
||||
const CompressionPlugin = require('compression-webpack-plugin');
|
||||
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
|
||||
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
|
||||
const CopyWebpackPlugin = require('copy-webpack-plugin');
|
||||
const vendorDllHash = require('./helpers/vendor_dll_hash');
|
||||
|
||||
const ROOT_PATH = '/usr/share/gitlab';
|
||||
@@ -127,12 +126,12 @@
|
||||
@@ -151,12 +150,12 @@
|
||||
|
||||
resolve: {
|
||||
extensions: ['.js', '.gql', '.graphql'],
|
||||
|
@ -23,7 +23,7 @@
|
|||
},
|
||||
|
||||
module: {
|
||||
@@ -375,19 +374,6 @@
|
||||
@@ -431,19 +430,6 @@
|
||||
// enable HMR only in webpack-dev-server
|
||||
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
|
||||
|
||||
|
@ -43,7 +43,7 @@
|
|||
new webpack.DefinePlugin({
|
||||
// This one is used to define window.gon.ee and other things properly in tests:
|
||||
'process.env.IS_EE': JSON.stringify(IS_EE),
|
||||
@@ -413,6 +399,7 @@
|
||||
@@ -469,6 +455,7 @@
|
||||
|
||||
node: {
|
||||
fs: 'empty', // sqljs requires fs
|
||||
|
|
Loading…
Add table
Reference in a new issue