Port some non-EE-specific config/ changes to CE
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
d772f52e1e
commit
78faa6e370
6 changed files with 29 additions and 13 deletions
|
@ -98,10 +98,11 @@ module Gitlab
|
|||
|
||||
# Enable the asset pipeline
|
||||
config.assets.enabled = true
|
||||
|
||||
# Support legacy unicode file named img emojis, `1F939.png`
|
||||
config.assets.paths << Gemojione.images_path
|
||||
config.assets.paths << "vendor/assets/fonts"
|
||||
config.assets.precompile << "*.png"
|
||||
config.assets.paths << "#{config.root}/vendor/assets/fonts"
|
||||
|
||||
config.assets.precompile << "print.css"
|
||||
config.assets.precompile << "notify.css"
|
||||
config.assets.precompile << "mailers/*.css"
|
||||
|
@ -110,7 +111,6 @@ module Gitlab
|
|||
config.assets.precompile << "xterm/xterm.css"
|
||||
config.assets.precompile << "performance_bar.css"
|
||||
config.assets.precompile << "lib/ace.js"
|
||||
config.assets.precompile << "vendor/assets/fonts/*"
|
||||
config.assets.precompile << "test.css"
|
||||
config.assets.precompile << "locale/**/app.js"
|
||||
|
||||
|
|
|
@ -467,8 +467,8 @@
|
|||
- - :license
|
||||
- pikaday
|
||||
- MIT
|
||||
- :who:
|
||||
:why:
|
||||
- :who:
|
||||
:why:
|
||||
:versions: []
|
||||
:when: 2017-10-17 17:46:12.367554000 Z
|
||||
- - :license
|
||||
|
|
|
@ -184,7 +184,7 @@ production: &base
|
|||
# ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
|
||||
|
||||
## Auxiliary jobs
|
||||
# Periodically executed jobs, to self-heal Gitlab, do external synchronizations, etc.
|
||||
# Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc.
|
||||
# Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
|
||||
cron_jobs:
|
||||
# Flag stuck CI jobs as failed
|
||||
|
@ -642,6 +642,8 @@ test:
|
|||
enabled: true
|
||||
lfs:
|
||||
enabled: false
|
||||
artifacts:
|
||||
path: tmp/tests/artifacts
|
||||
gitlab:
|
||||
host: localhost
|
||||
port: 80
|
||||
|
@ -652,8 +654,6 @@ test:
|
|||
# user: YOUR_USERNAME
|
||||
pages:
|
||||
path: tmp/tests/pages
|
||||
artifacts:
|
||||
path: tmp/tests/artifacts
|
||||
repositories:
|
||||
storages:
|
||||
default:
|
||||
|
|
|
@ -2,11 +2,13 @@
|
|||
# before other initializers as Rails may otherwise memoize a list of migrations
|
||||
# excluding the post deployment migrations.
|
||||
unless ENV['SKIP_POST_DEPLOYMENT_MIGRATIONS']
|
||||
path = Rails.root.join('db', 'post_migrate').to_s
|
||||
Rails.application.config.paths['db'].each do |db_path|
|
||||
path = Rails.root.join(db_path, 'post_migrate').to_s
|
||||
|
||||
Rails.application.config.paths['db/migrate'] << path
|
||||
Rails.application.config.paths['db/migrate'] << path
|
||||
|
||||
# Rails memoizes migrations at certain points where it won't read the above
|
||||
# path just yet. As such we must also update the following list of paths.
|
||||
ActiveRecord::Migrator.migrations_paths << path
|
||||
# Rails memoizes migrations at certain points where it won't read the above
|
||||
# path just yet. As such we must also update the following list of paths.
|
||||
ActiveRecord::Migrator.migrations_paths << path
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,8 +2,10 @@
|
|||
# :medium - Nov 10, 2007
|
||||
# :long - November 10, 2007
|
||||
Date::DATE_FORMATS[:medium] = '%b %-d, %Y'
|
||||
Date::DATE_FORMATS[:csv] = '%Y-%m-%d'
|
||||
|
||||
# :short - 18 Jan 06:10
|
||||
# :medium - Jan 18, 2007 6:10am
|
||||
# :long - January 18, 2007 06:10
|
||||
Time::DATE_FORMATS[:medium] = '%b %-d, %Y %-I:%M%P'
|
||||
Time::DATE_FORMATS[:csv] = '%Y-%m-%d %H:%M:%S'
|
||||
|
|
|
@ -2,6 +2,18 @@
|
|||
# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
|
||||
|
||||
en:
|
||||
hello: "Hello world"
|
||||
activerecord:
|
||||
attributes:
|
||||
issue_link:
|
||||
source: Source issue
|
||||
target: Target issue
|
||||
errors:
|
||||
messages:
|
||||
label_already_exists_at_group_level: "already exists at group level for %{group}. Please choose another one."
|
||||
wrong_size: "is the wrong size (should be %{file_size})"
|
||||
size_too_small: "is too small (should be at least %{file_size})"
|
||||
size_too_big: "is too big (should be at most %{file_size})"
|
||||
views:
|
||||
pagination:
|
||||
previous: "Prev"
|
||||
|
|
Loading…
Reference in a new issue