diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-12 14:52:59 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-12 14:52:59 +0300 |
commit | bd01d79f73f22f6e748a3c0a6489e0a3e3d1f18f (patch) | |
tree | e9b5e68c37771bcf54bc72557c29008756397bff /config | |
parent | d0d94e4f104c276ee4095a76d1204daae384c708 (diff) | |
parent | edb8ed36cd5ce315ca45a047bd06ab1dfcf44203 (diff) |
Merge branch 'master' into fe-paginated-environments-api
* master: (97 commits)
convert js-cookie dependency to an npm module
convert timeago.js dependency to an npm module
remove vue from vendor since it is now in node_modules
Add CHANGELOG file
Stylize blockquote in notification emails
Add js prefix to right sidebar
Replace accidentally deleted metaclick
Remove right padding from navbar-collapse on large screens
Add changelog
common_utils merge conflicts
Set sidebar height to 100% if at top of page
Set height of fixed sidebars with js
Add sticky sidebar on wiki page
Fix comment button test for slash commands
Fix time tracking spec
Fix issue boards sidebar alignment and sidebar toggle spec
Fix failing conflicts test
Fix build sidebar scrolling
Refactor JS
Fix pinned sidebar alignment
...
Diffstat (limited to 'config')
-rw-r--r-- | config/dependency_decisions.yml | 18 | ||||
-rw-r--r-- | config/initializers/rspec_profiling.rb | 8 | ||||
-rw-r--r-- | config/webpack.config.js | 31 |
3 files changed, 41 insertions, 16 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index aabe859730a..7336d7c842a 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -302,3 +302,21 @@ :why: https://github.com/dchest/tweetnacl-js/blob/master/LICENSE :versions: [] :when: 2017-01-14 20:10:57.812077000 Z +- - :approve + - wordwrap + - :who: Mike Greiling + :why: https://github.com/substack/node-wordwrap/blob/0.0.3/LICENSE + :versions: [] + :when: 2017-02-08 20:17:13.084968000 Z +- - :approve + - spdx-expression-parse + - :who: Mike Greiling + :why: https://github.com/kemitchell/spdx-expression-parse.js/blob/v1.0.4/LICENSE + :versions: [] + :when: 2017-02-08 22:33:01.806977000 Z +- - :approve + - spdx-license-ids + - :who: Mike Greiling + :why: https://github.com/shinnn/spdx-license-ids/blob/v1.2.2/LICENSE + :versions: [] + :when: 2017-02-08 22:35:00.225232000 Z diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb index f462e654b2c..0ef9f51e5cf 100644 --- a/config/initializers/rspec_profiling.rb +++ b/config/initializers/rspec_profiling.rb @@ -4,6 +4,12 @@ module RspecProfilingConnection end end +module RspecProfilingGitBranchCi + def branch + ENV['CI_BUILD_REF_NAME'] || super + end +end + if Rails.env.test? RspecProfiling.configure do |config| if ENV['RSPEC_PROFILING_POSTGRES_URL'] @@ -11,4 +17,6 @@ if Rails.env.test? config.collector = RspecProfiling::Collectors::PSQL end end + + RspecProfiling::VCS::Git.prepend(RspecProfilingGitBranchCi) if ENV.has_key?('CI') end diff --git a/config/webpack.config.js b/config/webpack.config.js index 968c0076eaf..00f448c1fbb 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -48,26 +48,23 @@ var config = { devtool: 'inline-source-map', module: { - loaders: [ + rules: [ { test: /\.(js|es6)$/, exclude: /(node_modules|vendor\/assets)/, loader: 'babel-loader', - query: { - // 'use strict' was broken in sprockets-es6 due to sprockets concatination method. - // many es5 strict errors which were never caught ended up in our es6 assets as a result. - // this hack is necessary until they can be fixed. - blacklist: ['useStrict'] + options: { + presets: [ + ["es2015", {"modules": false}], + 'stage-2' + ] } }, { test: /\.(js|es6)$/, + exclude: /node_modules/, loader: 'imports-loader', - query: 'this=>window' - }, - { - test: /\.json$/, - loader: 'json-loader' + options: 'this=>window' } ] }, @@ -88,7 +85,7 @@ var config = { ], resolve: { - extensions: ['', '.js', '.es6', '.js.es6'], + extensions: ['.js', '.es6', '.js.es6'], alias: { '~': path.join(ROOT_PATH, 'app/assets/javascripts'), 'bootstrap/js': 'bootstrap-sass/assets/javascripts/bootstrap', @@ -104,14 +101,16 @@ if (IS_PRODUCTION) { config.devtool = 'source-map'; config.plugins.push( new webpack.NoErrorsPlugin(), + new webpack.LoaderOptionsPlugin({ + minimize: true, + debug: false + }), new webpack.optimize.UglifyJsPlugin({ - compress: { warnings: false } + sourceMap: true }), new webpack.DefinePlugin({ 'process.env': { NODE_ENV: JSON.stringify('production') } - }), - new webpack.optimize.DedupePlugin(), - new webpack.optimize.OccurrenceOrderPlugin() + }) ); } |