d51618b9a1
Conflicts: config/gitlab.yml.example config/initializers/1_settings.rb |
||
---|---|---|
.. | ||
1_settings.rb | ||
2_app.rb | ||
3_grit_ext.rb | ||
4_sidekiq.rb | ||
5_backend.rb | ||
backtrace_silencers.rb | ||
carrierwave.rb | ||
connection_fix.rb | ||
devise.rb | ||
gemoji.rb | ||
inflections.rb | ||
kaminari_config.rb | ||
mime_types.rb | ||
postgresql_limit_fix.rb | ||
secret_token.rb | ||
session_store.rb | ||
wrap_parameters.rb |