delta/gitlab/gitlab-ce.git/spec/models, branch compare-code-view

Merge branch 'fix/persistent-import-data' into 'master'

2016-07-14T14:50:34+00:00


Fix import_data being saved as a result of an invalid import_url

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

Seem that in all cases the `import_url` was an empty string. The `import_url` is now validated correctly and no longer creates the `import_data`even if it fails validation. <= Should cover cases 1, 3, and 4 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276

Also, it now rescues from all exceptions when importing from a URL, so we make sure the `import_status` is failed after that. Covers case 2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276

See merge request !5206

Revert "Merge branch '18193-developers-can-merge' into 'master' "

2016-07-13T18:57:30+00:00

This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing
changes made to fb229bbf7970ba908962b837b270adf56f14098f.

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/persistent-import-data

2016-07-13T11:44:07+00:00

Enforce "developers can merge" during `pre-receive`.

2016-07-13T07:54:56+00:00

1. When a merge request is being merged, save the merge commit SHA in
   the `in_progress_merge_commit_sha` database column.

2. The `pre-receive` hook looks for any locked (in progress) merge
   request with `in_progress_merge_commit_sha` matching the `newrev` it
   is passed.

3. If it finds a matching MR, the merge is legitimate.

4. Update `git_access_spec` to test the behaviour we added here. Also
   refactored this spec a bit to make it easier to add more contexts / conditions.

Avoid `describe`-ing symbols in specs

2016-07-12T15:27:58+00:00

fixes a few issues to do with import_url not being saved correctly for imports. This should prevent the import_data to be created when it should not and output an error properly validating before creating it.

2016-07-12T14:21:28+00:00

Optimize system note visibility checking by hiding notes that

2016-07-11T22:09:21+00:00

have been fully redacted and contain cross-project references.

The previous implementation relied on Note#cross_reference_not_visible_for?,
which essentially tries to render all the Markdown references in a system note
and only displays the note if the user can see the referring project. But this
duplicated the work that Banzai::NotesRenderer was doing already. Instead, for
each note we render, we memoize the number of visible user references and
use it later if it is available.

Improves #19273

Support renames in diff_for_path actions

2016-07-11T08:31:34+00:00

Collapse large diffs by default

2016-07-08T09:56:55+00:00

When rendering a list of diff files, skip those where the diff is over
10 KB and provide an endpoint to render individually instead.

Merge branch 'feature/option-set-new-users-external' into 'master'

2016-07-08T08:29:18+00:00


Added setting to set new users by default as external

## What does this MR do?
This implements the feature request #14508. It adds an option in the application settings to set new users by default as external.

## Are there points in the code the reviewer needs to double check?
Everything. Like I mentioned in the discussion of the issue my knowledge of Ruby basically doesn't exists. I tested it on my machine and it seems to work, but as I am very unexperienced in Ruby I highly recommend to  take a close look at the code.

## Why was this MR needed?
It was requested by @DouweM to work on the issue with the proposed changes by me.

## What are the relevant issue numbers?
This MR is for the issue #14508 that followed up after the implementation of #4009.

See merge request !4545