delta/gitlab/gitlab-ce.git/spec/requests, branch remove_sqlite_check

Merge remote-tracking branch 'dev/master' into 'master'

2016-02-09T17:13:58+00:00

Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master'

2016-02-09T16:01:20+00:00


Expose MergeRequest#merge_status

_Originally opened at !2478 by @develop7._

- - -

This enables API users to see whether a merge request can be merged without conflicts.

See merge request !2756

Add an API spec for MergeRequest#merge_status and properly document this resource

2016-02-08T16:18:44+00:00

Fix commit status tests

2016-02-06T14:01:37+00:00

Merge remote-tracking branch 'origin/master' into ci-permissions

2016-02-04T12:16:48+00:00

# Conflicts:
#	app/views/projects/builds/index.html.haml

Extract shared context level up in build specs

2016-02-04T09:24:14+00:00

Also improve performance of specs by joining some of examples.

Improve CI API specs related to operations on build

2016-02-04T09:13:58+00:00

Conflicts:
	spec/factories/ci/builds.rb

Merge branch 'support-akismet' into 'master'

2016-02-03T01:26:30+00:00


Support Akismet spam checking for creation of issues via API

Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.

Closes #5612

See merge request !2266

Add a spec for the API pagination Link header

2016-02-02T14:26:29+00:00

Fix rubocop offenses

2016-02-02T13:25:44+00:00