delta/gitlab/gitlab-ce.git, branch simplify-gitlab-url_builder-15202 gitlab.com: gitlab-org/gitlab-ce.git Refactor and expose only Gitlab::UrlBuilder.build(record) 2016-04-13T14:07:04+00:00 Rémy Coutable remy@rymai.me 2016-04-13T09:25:42+00:00 02cfbf0db5dda8ca86f4811e5d5cb055a8cc5cfb Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Merge branch 'custom-transaction-tags' into 'master' 2016-04-13T10:02:30+00:00 Rémy Coutable remy@rymai.me 2016-04-13T10:02:30+00:00 bbf49ffca1c1be65567afa76961d176e57d40150 Added ability to add custom tags to transactions cc @pcarranza See merge request !3674 

Added ability to add custom tags to transactions

cc @pcarranza 

See merge request !3674
 Merge branch 'configure_trusted_proxies' into 'master' 2016-04-13T09:53:13+00:00 Rémy Coutable remy@rymai.me 2016-04-13T09:53:13+00:00 e83424a13e1b5d2e55ae5bd0aeae6a4c5f88262a Adjust the default trusted_proxies to only include localhost And also allow other trusted proxies to be added from the config.yml. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538 Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208 See merge request !3524 

Adjust the default trusted_proxies to only include localhost

And also allow other trusted proxies to be added from the config.yml.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538

Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208

See merge request !3524
 Merge branch 'jira_docs' into 'master' 2016-04-13T09:32:52+00:00 Achilleas Pipinellis axilleas@axilleas.me 2016-04-13T09:32:52+00:00 5d14615a762d63ba3e04fa5ebbbbd990bdbd7572 Tie example config to JIRA screenshot Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203 See merge request !3693 

Tie example config to JIRA screenshot

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

See merge request !3693
 Tie example config to JIRA screenshot 2016-04-13T09:28:07+00:00 Achilleas Pipinellis axilleas@axilleas.me 2016-04-13T09:28:07+00:00 244219376d84f0c78db3b898f0b7a18c88f9a840 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203
Added ability to add custom tags to transactions 2016-04-13T09:22:37+00:00 Yorick Peterse yorickpeterse@gmail.com 2016-04-12T10:00:21+00:00 3240ecfbefc7ae5994be6ef01b52c1cbdaa09057 One use case for this is manually setting the "action" tag for Grape API calls. Due to Grape running blocks there are no human readable method names that can be used for the "action" tag, thus we have to set these manually on a case by case basis. 
One use case for this is manually setting the "action" tag for Grape API
calls. Due to Grape running blocks there are no human readable method
names that can be used for the "action" tag, thus we have to set these
manually on a case by case basis.
Merge branch 'issue_15044' into 'master' 2016-04-13T09:10:57+00:00 Rémy Coutable remy@rymai.me 2016-04-13T09:10:57+00:00 8ea6c6d80c0942e0f2caee3caa0cd7503e51d45d Allow to close invalid merge request fixes #15044 See merge request !3664 

Allow to close invalid merge request

fixes #15044

See merge request !3664
 Merge branch 'docs-new-branch-button-3886' into 'master' 2016-04-13T09:02:14+00:00 Achilleas Pipinellis axilleas@axilleas.me 2016-04-13T09:02:14+00:00 6bb71869b8c003e9e880646afa35050821e7dac9 Docs for the new branch button [ci-skip] Closes #3886 @axil Could you check this and make sure this is up to your standards? See merge request !3425 

Docs for the new branch button

[ci-skip]

Closes #3886 

@axil Could you check this and make sure this is up to your standards?



See merge request !3425
 Merge branch 'fix-stale-branch-count-cache' into 'master' 2016-04-13T08:37:51+00:00 Yorick Peterse yorickpeterse@gmail.com 2016-04-13T08:37:51+00:00 57e660d8f3eae731e63c934416b4802ee3c45a23 Fix repository cache invalidation issue when project is recreated with an empty repo See merge request !3692 

Fix repository cache invalidation issue when project is recreated with an empty repo

See merge request !3692
 Move 'New branch from issue' feature doc to web_editor.md 2016-04-13T08:31:06+00:00 Achilleas Pipinellis axilleas@axilleas.me 2016-04-13T08:31:06+00:00 4a09a6c6f21c0bcd48123759cd6804276d810929 [ci skip] 
[ci skip]