delta/gitlab/gitlab-ce.git, branch grapify-projects-api

Grapify the projects API

2016-11-28T20:01:43+00:00

Merge branch 'dynamic-build-fixture' into 'master'

2016-11-28T16:43:46+00:00


Create dynamic fixture for build_spec

## What does this MR do?

Replace `spec/javascripts/fixtures/build.html.haml` by a dynamically created fixture (using `rake teaspoon:fixtures`).

## Why was this MR needed?

The existing fixture was not representing the real page. 

## What are the relevant issue numbers?

#24614 would have been avoided

following !6059

See merge request !7589

Merge branch '24813-project-members-with-developer-access-can-no-longer-create-tags' into 'master'

2016-11-28T16:02:46+00:00


Create tag after running pre-hooks and pass updated SHA to post-hooks

Closes #24813

See merge request !7700

Pass tag SHA to post-receive hook when tag is created via UI

2016-11-28T14:04:51+00:00

We only know the tag SHA after we create the tag.
This means that we pass a different value to the hooks that happen before
creating the tag, and a different value to the hooks that happen after
creating the tag.

This is not an ideal situation, but it is a trade-off we decided to
make. For discussion of the alternatives please refer to
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7700#note_18982873

"pre-receive" and "update" hooks always get the SHA of the commit
that the tag points to. "post-receive" gets the tag SHA if it is
an annotated tag or the commit SHA if it is an lightweight tag.
Currently we always create annotated tags if UI is used.

Merge branch '24860-actionview-template-error-undefined-method-size-for-nil-nilclass' into 'master'

2016-11-28T12:44:10+00:00


Prevent error when submitting a merge request and pipeline is not defined

Closes #24860

See merge request !7707

Revert "Pass correct tag target to post-receive hook when creating tag via UI"

2016-11-28T12:00:42+00:00

This reverts commit ae51774bc45d2e15ccc61b01a30d1b588f179f85.

Merge branch 'issuable_filters_present-refactor' into 'master'

2016-11-28T11:37:53+00:00


Refactor issuable_filters_present to reduce duplications

See https://gitlab.com/gitlab-org/gitlab-ce/issues/23546

See merge request !7776

Merge branch 'rs-phantomjs-disable-images' into 'master'

2016-11-28T11:37:21+00:00


Pass `--load-images=no` to PhantomJS via Capybara/Poltergeist

We were unintentionally hitting `gravatar.com` whenever a test that used
Poltergeist was run. This was certainly wasting their resources and
slowing down our tests even further, for no reason.

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899

See merge request !7781

Prevent error when submitting a merge request and pipeline is not defined

2016-11-28T11:03:59+00:00

Merge branch 'rs-project-security-spec-speed' into 'master'

2016-11-28T10:42:21+00:00


Speed up Project security access specs

Prior, every single test was creating four `ProjectMember` objects, each
of which created one `User` record, even though each test only used
_one_ of those Users, if any.

Now each test only creates the single user record it needs, if it needs
one. This shaves minutes off of each spec file changed here.

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899

See merge request !7779