delta/gitlab/gitlab-ce.git/spec, branch file-toggle

Merge branch 'no-include-on-top-level' into 'master'

2016-11-03T17:23:34+00:00


Don't include Gitlab::Routing.url_helpers on top-level namespace (fix error for url_for)

## What does this MR do?

Tries to fix:

```
     ActionView::Template::Error:
      arguments passed to url_for can't be handled. Please require routes or provide your own implementation
```

One of the failed build: https://gitlab.com/gitlab-org/gitlab-ce/builds/5825797

See merge request !7265

Merge branch 'zj-expose-system-hooks' into 'master'

2016-11-03T16:05:40+00:00


Expose more info for SystemHooks

See merge request !6964

Merge branch 'fix/import-export-symlink-vulnerability' into 'security'

2016-11-03T15:04:18+00:00

Fix symlink vulnerability in Import/Export

Replaces https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2018 made by @james

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

See merge request !2022

Signed-off-by: Rémy Coutable

Merge branch 'fix/import-projectmember-security' into 'security'

2016-11-03T15:04:18+00:00

Fix Import/Export foreign key issue to do with project members

Cleans-up any foreign keys in `ProjectMember` - same as we do with the rest of the models when importing.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23837 and https://gitlab.com/gitlab-org/gitlab-ce/issues/23739

See merge request !2020

Signed-off-by: Rémy Coutable

Use stubs instead of modifying global states

2016-11-03T15:02:19+00:00

Try not to include anything globally!

2016-11-03T14:05:31+00:00

Add a `--force` option to bin/changelog

2016-11-02T22:15:20+00:00

Merge branch 'rs-bin-changelog' into 'master'

2016-11-02T13:25:47+00:00


Add a bin/changelog script and changelog documentation

See merge request !7098

Use the server's base URL without relative URL part when creating links in JIRA

2016-11-02T12:35:14+00:00

Signed-off-by: Rémy Coutable

Update docs and test description

2016-11-02T12:24:24+00:00

[ci skip]