diff options
| author | Regis <boudinot.regis@yahoo.com> | 2016-12-16 19:50:23 +0300 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2016-12-16 19:50:23 +0300 |
| commit | 211ee4b97c0754f30ff018d9a333e72559661a05 (patch) | |
| tree | c97c0c517ca205d30629d337669a9870ca7752ed /config | |
| parent | 27a4aef5848d36b38c861c952a098f85562a31df (diff) | |
| parent | ae71032d0af1730c359089f3edc9029a8b5c8acc (diff) | |
Merge branch 'master' into auto-pipelines-vue
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 6 | ||||
| -rw-r--r-- | config/initializers/math_lexer.rb | 2 | ||||
| -rw-r--r-- | config/initializers/workhorse_multipart.rb | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 310d9e80156..433e05830c2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -45,7 +45,7 @@ module Gitlab # # Parameters filtered: # - Password (:password, :password_confirmation) - # - Private tokens (:private_token, :authentication_token) + # - Private tokens # - Two-factor tokens (:otp_attempt) # - Repo/Project Import URLs (:import_url) # - Build variables (:variables) @@ -60,11 +60,13 @@ module Gitlab encrypted_key hook import_url + incoming_email_token key otp_attempt password password_confirmation private_token + runners_token secret_token sentry_dsn variables @@ -85,6 +87,8 @@ module Gitlab config.assets.precompile << "print.css" config.assets.precompile << "notify.css" config.assets.precompile << "mailers/*.css" + config.assets.precompile << "katex.css" + config.assets.precompile << "katex.js" config.assets.precompile << "graphs/graphs_bundle.js" config.assets.precompile << "users/users_bundle.js" config.assets.precompile << "network/network_bundle.js" diff --git a/config/initializers/math_lexer.rb b/config/initializers/math_lexer.rb new file mode 100644 index 00000000000..8a3388a267e --- /dev/null +++ b/config/initializers/math_lexer.rb @@ -0,0 +1,2 @@ +# Touch the lexers so it is registered with Rouge +Rouge::Lexers::Math diff --git a/config/initializers/workhorse_multipart.rb b/config/initializers/workhorse_multipart.rb new file mode 100644 index 00000000000..3e2f25c354a --- /dev/null +++ b/config/initializers/workhorse_multipart.rb @@ -0,0 +1,3 @@ +Rails.application.configure do |config| + config.middleware.use(Gitlab::Middleware::Multipart) +end |