delta/gitlab/gitlab-ce.git/doc, branch commit-limits

Merge branch 'patch-1' into 'master'

2016-03-02T17:43:05+00:00


Typo in API documentation

[ci skip]

See merge request !3058

Merge branch 'docs_todos' into 'master'

2016-03-02T12:37:29+00:00


Add Todos documentation

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13884

See merge request !3064

Add Todos documentation

2016-03-02T12:33:47+00:00

[ci skip]

typo

2016-03-02T09:42:14+00:00

Merge branch 'notes_guidelines' into 'master'

2016-03-02T08:00:33+00:00


Change doc styleguide to use blockquotes for notes



See merge request !3009

Merge branch 'saml-doc-update' into 'master'

2016-03-02T06:02:04+00:00


Updated SAML and Omniauth docs

Updated SAML and Omniauth docs with information on the new behavior recently introduced in !2882

/cc @ernstvn @DouweM 

See merge request !2950

Style updates.

2016-03-01T18:51:47+00:00

Merge branch 'rel-url-fix' into 'master'

2016-03-01T16:24:43+00:00


Fix relative URL

See https://github.com/gitlabhq/gitlabhq/issues/10053

 1. Same configuration way for relative URL like with Omnibus
 2. Loading the relative configuration from Rakefile as Rails do not load initializers for `asset:precompile`

First point has another positive side effect: no collisions (due to git controlled `application.rb`) any more during the upgrades of source based installations and relative url configuration

 - [x] tests on the source based installation
 - [x] tests on the centos&ubuntu omnibus packages

Fixes: gitlab-org/gitlab-ce#13730, gitlab-org/gitlab-ce#13727, gitlab-org/omnibus-gitlab#1143 and https://github.com/gitlabhq/gitlabhq/issues/10053

See merge request !2979

Merge branch 'triggers_link' into 'master'

2016-03-01T07:58:39+00:00


Add link to triggers doc in variables section

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13901

See merge request !3025

Add link to triggers doc in variables section

2016-03-01T07:57:09+00:00

[ci skip]