delta/gitlab/gitlab-ce.git/spec/controllers, branch sql-buckets

Merge branch 'jprovazn-rails5-boards' into 'master'

2018-06-11T15:55:29+00:00

[Rails5] Fix conversion of integer into string in board spec

Closes #47653

See merge request gitlab-org/gitlab-ce!19616

Don't use Rails.root.join for upload fixture paths

2018-06-11T11:54:25+00:00

Signed-off-by: Rémy Coutable

Merge branch 'rs-update-rspec' into 'master'

2018-06-11T09:59:25+00:00

Update rspec to 3.7

See merge request gitlab-org/gitlab-ce!19449

Fix conversion of integer into string in board spec

2018-06-09T20:58:28+00:00

In rails 5 controller specs, integers are converted to strings unless
conte-type is set with `as: :json`:
https://github.com/rails/rails/issues/26069

Users can accept terms during registration

2018-06-08T17:17:00+00:00

When a user checks the `accept` checkbox, we will track that
acceptance as usual. That way they don't need to accept again after
they complete the registration.

When an unauthenticated user visits the `/-/users/terms` page, there
is no button to accept, decline or continue. The 'current-user menu'
is also hidden from the top bar.

Merge branch 'feature/customizable-favicon' into 'master'

2018-06-07T16:54:41+00:00

Customizable favicon

Closes #15661

See merge request gitlab-org/gitlab-ce!14497

Make all uses of `fixture_file_upload` use relative paths

2018-06-07T14:54:41+00:00

Log response body to production_json.log when a controller responds with a 422 status

2018-06-06T20:16:15+00:00

We have a number of import errors occurring with 422 errors, and
it's hard to determine why they are happening. This change will
surface the errors in the log lines.

Relates to #47365

Merge branch 'bvl-graphql-start-34754' into 'master'

2018-06-06T10:03:34+00:00

GraphQL setup: Basic Project and Merge request endpoint

Closes #34754

See merge request gitlab-org/gitlab-ce!19008

Add missing tests around rendering invalid merge requests (HTML+JSON)

2018-06-05T22:18:40+00:00