delta/gitlab/gitlab-ce.git, branch backup-database-timeout-fix

Make sure there is a connection before using ActiveRecord

2016-02-08T16:31:24+00:00

Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master'

2016-02-08T13:34:58+00:00


Remember user's inline/tabular diff view preference in a cookie

_Originally opened at !1677 by @kkm._

---

As per #3071, some users (we have a local EE installation) prefer 2-column view in diff. In this MR I add an implementation for this feature, using a cookie.

Fixes #3071.

See merge request !2723

Merge branch 'contributing' into 'master'

2016-02-08T10:24:18+00:00


Rearrange some sections in CONTRIBUTING.md

- Move 'Merge request description format' and
  'Contribution acceptance criteria' under 'Merge requests'
- Link to doc_styleguide where appropriate
- Provide markdown template for merge requests

See merge request !2748

Rearrange some sections in CONTRIBUTING.md

2016-02-08T10:12:29+00:00

[ci skip]

Merge branch 'contributing_toc' into 'master'

2016-02-08T09:25:46+00:00


Add table of contents in CONTRIBUTING.md



See merge request !2745

Add table of contents in CONTRIBUTING.md

2016-02-08T09:23:30+00:00

Merge branch 'jira_when_ce' into 'master'

2016-02-07T22:42:51+00:00


Clarify when JIRA service was backported to CE



See merge request !2744

Clarify when JIRA service was backported to CE

2016-02-07T22:37:45+00:00

[ci skip]

Update CHANGELOG

2016-02-07T20:11:06+00:00

[ci skip]

Merge branch 'markdown_help' into 'master'

2016-02-07T15:59:47+00:00


Change logo image name in markdown documentation

Closes #13233

See merge request !2743