Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
78faa6e3
Commit
78faa6e3
authored
Jan 25, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port some non-EE-specific config/ changes to CE
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
d772f52e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
13 deletions
+29
-13
config/application.rb
config/application.rb
+3
-3
config/dependency_decisions.yml
config/dependency_decisions.yml
+2
-2
config/gitlab.yml.example
config/gitlab.yml.example
+3
-3
config/initializers/0_post_deployment_migrations.rb
config/initializers/0_post_deployment_migrations.rb
+7
-5
config/initializers/date_time_formats.rb
config/initializers/date_time_formats.rb
+2
-0
config/locales/en.yml
config/locales/en.yml
+12
-0
No files found.
config/application.rb
View file @
78faa6e3
...
@@ -98,10 +98,11 @@ module Gitlab
...
@@ -98,10 +98,11 @@ module Gitlab
# Enable the asset pipeline
# Enable the asset pipeline
config
.
assets
.
enabled
=
true
config
.
assets
.
enabled
=
true
# Support legacy unicode file named img emojis, `1F939.png`
# Support legacy unicode file named img emojis, `1F939.png`
config
.
assets
.
paths
<<
Gemojione
.
images_path
config
.
assets
.
paths
<<
Gemojione
.
images_path
config
.
assets
.
paths
<<
"vendor/assets/fonts"
config
.
assets
.
paths
<<
"
#{
config
.
root
}
/
vendor/assets/fonts"
config
.
assets
.
precompile
<<
"*.png"
config
.
assets
.
precompile
<<
"print.css"
config
.
assets
.
precompile
<<
"print.css"
config
.
assets
.
precompile
<<
"notify.css"
config
.
assets
.
precompile
<<
"notify.css"
config
.
assets
.
precompile
<<
"mailers/*.css"
config
.
assets
.
precompile
<<
"mailers/*.css"
...
@@ -110,7 +111,6 @@ module Gitlab
...
@@ -110,7 +111,6 @@ module Gitlab
config
.
assets
.
precompile
<<
"xterm/xterm.css"
config
.
assets
.
precompile
<<
"xterm/xterm.css"
config
.
assets
.
precompile
<<
"performance_bar.css"
config
.
assets
.
precompile
<<
"performance_bar.css"
config
.
assets
.
precompile
<<
"lib/ace.js"
config
.
assets
.
precompile
<<
"lib/ace.js"
config
.
assets
.
precompile
<<
"vendor/assets/fonts/*"
config
.
assets
.
precompile
<<
"test.css"
config
.
assets
.
precompile
<<
"test.css"
config
.
assets
.
precompile
<<
"locale/**/app.js"
config
.
assets
.
precompile
<<
"locale/**/app.js"
...
...
config/dependency_decisions.yml
View file @
78faa6e3
...
@@ -467,8 +467,8 @@
...
@@ -467,8 +467,8 @@
-
-
:license
-
-
:license
-
pikaday
-
pikaday
-
MIT
-
MIT
-
:who:
-
:who:
:why:
:why:
:versions: []
:versions: []
:when: 2017-10-17 17:46:12.367554000 Z
:when: 2017-10-17 17:46:12.367554000 Z
-
-
:license
-
-
:license
...
...
config/gitlab.yml.example
View file @
78faa6e3
...
@@ -184,7 +184,7 @@ production: &base
...
@@ -184,7 +184,7 @@ production: &base
# ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
# ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
## Auxiliary jobs
## Auxiliary jobs
# Periodically executed jobs, to self-heal Git
l
ab, do external synchronizations, etc.
# Periodically executed jobs, to self-heal Git
L
ab, do external synchronizations, etc.
# Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
# Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
cron_jobs:
cron_jobs:
# Flag stuck CI jobs as failed
# Flag stuck CI jobs as failed
...
@@ -642,6 +642,8 @@ test:
...
@@ -642,6 +642,8 @@ test:
enabled: true
enabled: true
lfs:
lfs:
enabled: false
enabled: false
artifacts:
path: tmp/tests/artifacts
gitlab:
gitlab:
host: localhost
host: localhost
port: 80
port: 80
...
@@ -652,8 +654,6 @@ test:
...
@@ -652,8 +654,6 @@ test:
# user: YOUR_USERNAME
# user: YOUR_USERNAME
pages:
pages:
path: tmp/tests/pages
path: tmp/tests/pages
artifacts:
path: tmp/tests/artifacts
repositories:
repositories:
storages:
storages:
default:
default:
...
...
config/initializers/0_post_deployment_migrations.rb
View file @
78faa6e3
...
@@ -2,11 +2,13 @@
...
@@ -2,11 +2,13 @@
# before other initializers as Rails may otherwise memoize a list of migrations
# before other initializers as Rails may otherwise memoize a list of migrations
# excluding the post deployment migrations.
# excluding the post deployment migrations.
unless
ENV
[
'SKIP_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
# 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.
# path just yet. As such we must also update the following list of paths.
ActiveRecord
::
Migrator
.
migrations_paths
<<
path
ActiveRecord
::
Migrator
.
migrations_paths
<<
path
end
end
end
config/initializers/date_time_formats.rb
View file @
78faa6e3
...
@@ -2,8 +2,10 @@
...
@@ -2,8 +2,10 @@
# :medium - Nov 10, 2007
# :medium - Nov 10, 2007
# :long - November 10, 2007
# :long - November 10, 2007
Date
::
DATE_FORMATS
[
:medium
]
=
'%b %-d, %Y'
Date
::
DATE_FORMATS
[
:medium
]
=
'%b %-d, %Y'
Date
::
DATE_FORMATS
[
:csv
]
=
'%Y-%m-%d'
# :short - 18 Jan 06:10
# :short - 18 Jan 06:10
# :medium - Jan 18, 2007 6:10am
# :medium - Jan 18, 2007 6:10am
# :long - January 18, 2007 06:10
# :long - January 18, 2007 06:10
Time
::
DATE_FORMATS
[
:medium
]
=
'%b %-d, %Y %-I:%M%P'
Time
::
DATE_FORMATS
[
:medium
]
=
'%b %-d, %Y %-I:%M%P'
Time
::
DATE_FORMATS
[
:csv
]
=
'%Y-%m-%d %H:%M:%S'
config/locales/en.yml
View file @
78faa6e3
...
@@ -2,6 +2,18 @@
...
@@ -2,6 +2,18 @@
# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
en
:
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
:
views
:
pagination
:
pagination
:
previous
:
"
Prev"
previous
:
"
Prev"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment