delta/gitlab/gitlab-ce.git/spec/models, branch parallel-diff

Merge branch 'start-with-iid-on-new-branch' into 'master'

2016-04-14T13:41:30+00:00


Start with iid on branch creation

After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name.

See merge request !3708

Start with iid on branch creation

2016-04-14T12:49:45+00:00

Allow empty recipient list when pusher is added

2016-04-14T08:24:09+00:00

Closes #13574

Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master'

2016-04-13T16:18:46+00:00


Fix a bug with trailing slash in bamboo_url

Also, improve specs for BambooService

Similar to !3679.

See merge request !3680

Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master'

2016-04-13T16:17:39+00:00


Fix trailing slash in teamcity_url

Originally opened at !2309 by @ctmay4.

As described in #3515, if you have trailing spaces in the the Teamcity server name, the service
will not work properly.  Switching from `URI.parse` to `URI.join` fixes it so that it works with
or without a trailing slash.

Fixes #3515.

See merge request !3679

Fix a bug with trailing slash in bamboo_url

2016-04-13T13:58:14+00:00

Also, improve specs for BambooService

Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515

Signed-off-by: Rémy Coutable

Improve TeamcityService and its specs

2016-04-13T08:01:49+00:00

Signed-off-by: Rémy Coutable

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

2016-04-13T07:04:17+00:00

To reproduce:

1. Create a project with some content
2. Rename the project
3. Create a new project with the same name.
4. Boom - 404.

After step 2, the branch and tag counts were not being cleared. This would
cause `repository.has_visible_content?` to erroneously return `true`
for the newly-created project.

Closes #13384

Merge branch 'master' into decouple-member-notification

2016-04-08T18:48:09+00:00

Expire caches after project creation to ensure a consistent state

2016-04-07T07:29:01+00:00

Closes #14961