Robert Speicher a81ce718c7 Merge branch 'rouge-patch' into 'master' ...

Fix highlighting of deleted lines in diffs.

Resolves internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2498

Only needed until https://github.com/jneen/rouge/pull/297 is merged into
Rouge and the gem is updated in GitLab.

Forking `rouge`, releasing `gitlab-rouge` and using that gem wasn't an
option, since `gollum-lib` has `rouge` as a dependency, so it would get
included anyway, and which code we'd get would depend on the load order.

See merge request !1267

2015-09-09 18:37:45 +00:00

..

environments

Merge pull request #8349 from divineforest/cleanup-assets-compress

2015-03-02 15:23:57 -08:00

initializers

Merge branch 'rouge-patch' into 'master'

2015-09-09 18:37:45 +00:00

locales

Improve OAuth application flash messages.

2015-05-13 09:41:56 +02:00

application.rb

Expire Rails cache entries after two weeks

2015-07-15 13:53:40 +02:00

aws.yml.example

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

boot.rb

init commit

2011-10-09 00:36:38 +03:00

database.yml.mysql

set the collation to utf8_general_ci

2014-08-13 14:45:23 +01:00

database.yml.postgresql

Remove 'socket' example PostgreSQL parameter

2014-07-01 18:27:50 +02:00

environment.rb

Use similar interface to access gitolite

2012-08-29 00:04:06 +03:00

gitlab.teatro.yml

Revert "Allow to configure smtp and sendmail in gitlab.yml"

2015-05-06 17:39:18 +03:00

gitlab.yml.example

Crowd integration

2015-09-02 12:42:01 +03:00

mail_room.yml.example

Ignore empty incoming messages.

2015-08-24 10:57:35 -07:00

newrelic.yml

Add dormant New Relic gem

2014-09-16 17:31:20 +02:00

resque.yml.example

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

routes.rb

Merge branch 'global_labels' into 'master'

2015-09-09 08:57:54 +00:00

unicorn.rb.example

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

unicorn.rb.example.development

Increase unicorn timeout to 60 seconds

2014-09-23 17:11:16 +03:00