Commit Graph
4716 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre e4f1c001e6 Restrict access to confidential issues through API 2016-03-17 20:55:59 -03:00
Douglas Barbosa Alexandre 7ee528336a Restrict access for confidential issues on autocomplete 2016-03-17 20:55:59 -03:00
Douglas Barbosa Alexandre 43d8bdb4f0 Restrict access to references for confidential issues 2016-03-17 20:55:59 -03:00
Douglas Barbosa Alexandre 34ee75379c Restrict access to confidential issues 2016-03-17 20:55:38 -03:00
Felipe Artur 0a7f716119 Code fixes 2016-03-17 19:42:46 -03:00
Yorick Peterse dd4b789765 Added tests for Repository#build_cache 2016-03-17 21:45:43 +01:00
Yorick Peterse cd05d3f78d Cache project avatars stored in Git
The avatar logic has been moved from Project to Repository as this makes
caching easier. The logic itself in turn has been changed so that the
logo file names are cached in Redis. This cache is flushed upon pushing
a commit but _only_ if:

1. The commit was pushed to the default branch
2. The commit actually changes any of the logo files

If no branch or commit is given the cache is flushed anyway, this
ensures that calling Repository#expire_cache without any arguments still
flushes the avatar cache (e.g. this is used when removing a project).

Fixes gitlab-org/gitlab-ce#14363
2016-03-17 18:51:54 +01:00
Kamil Trzciński f728e4b519 Merge branch 'glalonde-triggerbuild' into 'master'
Adjusted behavior so canceled builds tagged as allowed to fail do not fail build

## What does this MR do?
This diff changes the 'Allowed to fail' flag to also ignore canceled builds, whereas before, canceled builds could fail the suite even if they were marked as 'Allowed to fail'

dupe of !3258 to force a build

## Are there points in the code the reviewer needs to double check?
no

## Why was this MR needed?
Unexpected behavior as a user

## What are the relevant issue numbers?

## Screenshots (if relevant)
![whatisgoingon](/uploads/fcd7c8f3d8454bc730d7fd41eff59b31/whatisgoingon.png)

See merge request !3271
2016-03-17 15:51:11 +00:00
Geoffrey Lalonde 4117c815df adjusted behavior so canceled builds tagged as allowed to fail do not fail build 2016-03-17 07:55:10 -07:00
Douwe Maan 21af7459ab Merge branch '4009-external-users' into 'master'
External Users

The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.

Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users)


![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png)

See merge request !3171
2016-03-17 14:15:38 +00:00
Grzegorz Bizon fcf106897e Do not use javascript in specs for issue move
Feature specs that were using javascript took a long time to finish
(about 10x longer) and where hitting Poltergeist timeouts.

This modification skips using javascript with select2 selecbox, thus it
is faster, but this also does not check some JavaScript related
features.
2016-03-17 12:25:17 +01:00
Zeger-Jan van de Weg 9337406671 Fix specs
Spinach was right, I was a fool..
2016-03-17 12:05:54 +01:00
Grzegorz Bizon b9036ba610 Prevent issue move if issue has been already moved 2016-03-17 11:48:51 +01:00
Zeger-Jan van de Weg 481e73fb76 Merge branch 'master' into new-branch-button-issue 2016-03-17 11:13:16 +01:00
Zeger-Jan van de Weg 51300d9b2a API support for setting External flag on existing users 2016-03-17 09:36:00 +01:00
Grzegorz Bizon e3d32ff036 Add feature specs for issue move 2016-03-17 07:39:16 +01:00
Grzegorz Bizon 5e3c9475a9 Add minor improvements in code related to issue move 2016-03-17 07:39:16 +01:00
Grzegorz Bizon 1dd279d833 Use helper to create list of projects issue can be moved to
This also adds confirmation message if issue move has been requested.
2016-03-17 07:39:16 +01:00
Grzegorz Bizon 15d32b6a11 Add new notifications for issue move action
[ci skip]
2016-03-17 07:39:16 +01:00
Grzegorz Bizon a23f0e8c9e Reuse existing issue services when moving issue 2016-03-17 07:39:16 +01:00
Grzegorz Bizon a91101b19a Make it possible to move issue if user is a reporter
Discussed it here:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2831#note_4190228
2016-03-17 07:39:16 +01:00
Grzegorz Bizon 310b417b0f Preserve original author when moving issue
This also wrapps entire process into transation, as rewriting references
may have large memory footprint.
2016-03-17 07:39:16 +01:00
Grzegorz Bizon 4354bfaba5 Add implementation of reference unfolder using banzai 2016-03-17 07:39:16 +01:00
Grzegorz Bizon fd8394faae Move reference unfolder for GFM to separate class 2016-03-17 07:39:15 +01:00
Grzegorz Bizon 9124ebce98 Use internal reference extractor in banzai unfold pipeline 2016-03-17 07:39:15 +01:00
Grzegorz Bizon 3c493c24c7 Add reference unfold pipeline used when moving issue 2016-03-17 07:39:15 +01:00
Grzegorz Bizon efd8251751 Minor refactoring of issue move service and specs 2016-03-17 07:39:15 +01:00
Grzegorz Bizon c2d4060f26 Rewrite references in notes when moving issue 2016-03-17 07:39:15 +01:00
Grzegorz Bizon 8d3f072ec4 Take care about data being rewritten when moving issue 2016-03-17 07:39:15 +01:00
Grzegorz Bizon fbb5a8b089 Use a new issue create service when moving an issue 2016-03-17 07:39:15 +01:00
Grzegorz Bizon 57eb395488 Do not pass unsanitized params to issue move service 2016-03-17 07:39:15 +01:00
Grzegorz Bizon 4cbe87d50e Rewrite references in issue description when moving it 2016-03-17 07:39:15 +01:00
Grzegorz Bizon 5ed8a1e107 Silently close old issue when it has been moved 2016-03-17 07:39:15 +01:00
Grzegorz Bizon 8a02449440 Do not show issue move form unless user can move 2016-03-17 07:39:15 +01:00
Grzegorz Bizon 8d1b7f9507 Add issue move ability and use it in move service 2016-03-17 07:39:15 +01:00
Grzegorz Bizon 14c983fb69 Add implementation that rewrites issue notes when moving 2016-03-17 07:39:15 +01:00
Grzegorz Bizon c8e7d1ed8e Add issue move implementation to controller 2016-03-17 07:39:15 +01:00
Grzegorz Bizon 9882802a8b Improve system notes that are added when issue is moved 2016-03-17 07:39:15 +01:00
Grzegorz Bizon 69b89d4ec8 Add new system note used when issue has been moved 2016-03-17 07:39:15 +01:00
Grzegorz Bizon b53d9f8a0e Add scaffold of service that moves issue to another project 2016-03-17 07:39:15 +01:00
Hiroyuki Sato f0b052e168 Fix wiki search results point to raw source 2016-03-17 08:58:52 +09:00
Felipe Artur 44c127447b Merge 4009-external-users into issue_12658 2016-03-16 20:16:42 -03:00
Felipe Artur ec20fdf366 Code improvements and add Create group service 2016-03-16 19:44:33 -03:00
Pierre de La Morinerie 18295585d9 Fix MergeRequest#source_sha when there is no diff
`MergeRequest#source_sha` is expected to return the sha of the source
branch last commit.

But when a open Merge Request has no diff (e.g. all commits have already
been merged to the target branch), `merge_request.source_sha`
incorrectly returns `nil`.

This was un-noticed before – but now that !2217 has been merged,
it makes `Gitlab::Git::Commit.between` raise an
"Unexpected nil argument" exception.

This fixes the crash, by making sure that `source_sha` returns a
correct result even when there is no diff available.
2016-03-16 14:02:04 +01:00
Pierre de La Morinerie 7cbf8fd0d0 Add tests for MergeRequest#source_sha 2016-03-16 13:56:47 +01:00
Robert Speicher 374037b8a3 Merge branch 'issue_14306' into 'master'
Return an empty Array when there aren't lines to parse.

Fixes #14306

See merge request !3243
2016-03-16 01:29:09 +00:00
Douwe Maan f83a596db3 Merge branch 'worker-for-user-deletion' into 'master'
A worker deletes a user, so the request doesn't time out

Fixes #13261


See merge request !2855
2016-03-16 01:18:46 +00:00
Rubén Dávila 7e03b40221 Return an empty Array when there aren't lines to parse. 2016-03-15 19:51:27 -05:00
Robert Speicher 64d0dd1807 Merge branch 'fix-capybara-deprecation-warnings' into 'master'
Fix Capybara 2.6.2 deprecation warnings

See merge request !3236
2016-03-16 00:00:38 +00:00
Zeger-Jan van de Weg 29a43373ce Specs for the DeleteUserService 2016-03-15 22:19:51 +01:00