Commit Graph
4716 Commits
Author SHA1 Message Date
Grzegorz Bizon 57ea33bfd0 Extend specs for GFM uploads rewriter 2016-03-31 09:43:47 +02:00
Rémy Coutable e60f034126 Fix view of notes in search results when noteable is a snippet
Also, streamline the view.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-03-31 09:40:57 +02:00
James Lopez c2d5cc91c0 updated spec 2016-03-31 09:22:28 +02:00
Yorick Peterse 84764847f7 Merge branch 'reorder-project-expire-cache' into 'master'
Expire the exists cache before deletion to ensure project dir actually exists

See merge request !3413
2016-03-30 22:51:36 +00:00
Yorick Peterse c4ece04b69 Merge branch 'check-project-repo-exists' into 'master'
Check if repo exists before attempting to update cache info

See merge request !3414
2016-03-30 22:50:15 +00:00
Douglas Barbosa Alexandre 26b2810355 Mentions on confidential issues doesn't create todos for non-members 2016-03-30 18:41:21 -03:00
Robert Speicher 794674379e Merge branch 'cleanup-system-hook-spec' into 'master'
minor cleanup in system_hook_spec

Clean up extracted from !3439

See merge request !3459
2016-03-30 21:16:07 +00:00
Gabriel Mazetto 7d56d592cd Fixed Gollum pages link url expansion to render correctly in preview 2016-03-30 15:43:58 -03:00
Dmitriy Zaporozhets fa9d140f00 Merge branch 'precompile-emoji-urls' into 'master'
Pre-calculate Emoji digests

cc @dzaporozhets @rspeicher 

@marin Do you happen to know if we allow users to configure asset hosts anywhere in Omnibus and such? I've not been able to find any reference to "asset_host" so it seems we don't allow this (which is a good thing as this simplifies the code).

See merge request !3458
2016-03-30 18:23:13 +00:00
Zeger-Jan van de Weg 4b1ad75ab5 minor cleanup in system_hook_spec 2016-03-30 20:00:57 +02:00
Yorick Peterse 5830d80b8d Pre-calculate Emoji digests
By pre-calculating the digests we can manually construct the emoji URLs,
removing the need for using Rails' asset URL helpers. The reason we
don't want to use these helpers for Emojis is two-fold:

1. Rails' image_url() method is slow, really slow. For one it _might_
   have to calculate digests but it also performs a lot of other
   intensive operations (judging by the source code and based on
   measuring timings).

2. We have a lot of Emoji which coupled with the above can result in it
   taking minutes to load Emoji autocomplete data.

Using this pre-calculation setup generating the digests takes around 7
seconds (including the time it takes to start Rails/Rake), and only
around 600 milliseconds to load _all_ the autocomplete data of a project
(measured locally).

This commit _does_ change the Emoji URLs from absolute to relative URLs
as these are much easier to generate.

To update the Emoji data simply run:

    rake gemojione:digests

Then commit any changes.

Fixes gitlab-org/gitlab-ce#14009
2016-03-30 19:29:17 +02:00
Robert Speicher 673bb9ef1e Merge branch 'tests/isolate-carrierwave-uploads' into 'master'
Isolate CarrierWave uploads in test enviroment

Purpose of this merge request is to isolate CarrierWave uploads in test environment, from regular development/production uploads.
We need to persist some files in order to test some features thoroughly. If we - for example - want to check if file exists after being uploaded via API, or we need to write tests that check if file has been correctly removed we need to persist uploads using CarrierWave.

This approach simply sets `root` path for uploads in test environment and removes temporary directory after executing RSpec tests suite. We set this in `spec_helper` to keep this in one place, this also can be set up in test environment initializer.

This issue is a workaround for #12968, but does not solve this problem completely, because if uploader defines absolute path in `store_dir` or defines custom `root` path, this may not work correctly (but it looks like we do have such uploaders at this moment).

See merge request !3435
2016-03-30 17:28:09 +00:00
James Lopez 2d544d5445 spec and fix for fogbugz lonely user problem 2016-03-30 18:48:28 +02:00
Douwe Maan c9a7cc4b37 Merge branch '2364-fallback-to-in-reply-to-header' into 'master'
Fall back to In-Reply-To and References headers when sub-addressing is not available

_Originally opened at !3024 by @dabit._

- - -

Fixes #2364 

Summary of the changes:
- No more need to have the `%{key}` placeholder in the `incoming_email.address`
- The fallback message id format is `reply-[key]@[gitlab_host]` (reminder: it doesn't have to be a real email address)
- The fallback message id that includes the reply key is added to both `References` header
- Documentation for the "Reply by email" feature updated

See merge request !3305
2016-03-30 16:16:37 +00:00
Robert Speicher 3d4848615c Merge branch 'patch/fix-mergerequest-diff' into 'master'
Fix Raw / Rendered diff producing different results on merge requests

The raw diff endpoint (`merge_requests/####.diff`) produces a diff based on `target_branch` instead of the original branching point. Same is valid for `merge_requests/####.patch`.

Fixes #14680, #3017

See merge request !3450
2016-03-30 16:02:19 +00:00
Robert Speicher 489165e343 Merge branch 'refactor/project-badges-interface' into 'master'
Refactor builds badge, encapsulate inside a class

This merge requests attempts to introduce interface for all badges.
Currently we only have a build badge, but other badges are in plans,
like coverage badge.

See merge request !3403
2016-03-30 15:42:26 +00:00
Douglas Barbosa Alexandre 9b93f8adc8 Destroy related todos when an issue is deleted 2016-03-30 12:09:34 -03:00
Grzegorz Bizon 6f0cba11da Ensure uploads dir exists when running backup specs 2016-03-30 15:40:49 +02:00
Grzegorz Bizon 6e747d720d Move CarrierWave test env config to separate file 2016-03-30 13:57:01 +02:00
Grzegorz Bizon b9f5719285 Remove reduntant move_to_store override 2016-03-30 12:50:19 +02:00
Dmitriy Zaporozhets 630c86a7a3 Add spec for user_id uniq in NotificationSetting model
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 08b3d7f6ef Refactor notification helper and fix notification service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 4ca73f56cb Small refactoring and cleanup of notification logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets b8f3843790 Update NotificationService to use NotificationSettings instead of membership
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 31b0e53015 Introduce NotificationSetting model
It will hold notification setting per group or per project. It will
allow get rid of notification level stored in Member model

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Grzegorz Bizon d08de5ed0e Add support for not Active Record based factories 2016-03-30 10:44:18 +02:00
Grzegorz Bizon f2674c7b98 Refactor uploads rewriter used when moving issue 2016-03-30 10:44:18 +02:00
Grzegorz Bizon 0b8cefd3b2 Get FileUploader into test harness using factory
This attempts to get CarrierWave's uploader - `FileUploader` into test
harness using a factory. that makes it easier to build an instance of
it.

Along with !3435 it may be easier to use uploaders in tests
2016-03-30 10:44:18 +02:00
Grzegorz Bizon 701976e081 Add uploads rewriter and use it when moving issue 2016-03-30 10:44:18 +02:00
Rémy Coutable 4a4398560c Merge branch 'added-milestone-upcoming' into 'master'
Dropdown bug fixes

- Added back upcoming to milestone filter

![Screen_Shot_2016-03-23_at_16.45.22](/uploads/8c31eff7e0984aad17881f6397ff17cd/Screen_Shot_2016-03-23_at_16.45.22.png)

- Fixed bug that would cause the currently selected value to disappear on filters
- Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past

Closes #14536

See merge request !3368
2016-03-30 06:49:04 +00:00
Gabriel Mazetto 808bcf5bc6 Fixed MergeRequestController spec 2016-03-30 00:02:32 -03:00
Robert Speicher 999ae7f76b Merge branch 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master'
api - expose label description

Resolves #14415

See merge request !3314
2016-03-29 16:21:16 -04:00
Robert Speicher a9f5df384e Merge branch 'fix_wip_in_mr_api' into 'master'
Ensuring Merge Request API returns boolean values for work_in_progress

Fixes #14692.

See merge request !3432
2016-03-29 18:49:08 +00:00
Phil Hughes 6a3d8ac207 Spec updates 2016-03-29 18:20:10 +01:00
Robert Speicher b1f924c165 Merge branch 'handle-nil-description-slack-message' into 'master'
Handle nil descriptions in Slack issue messages

Closes #14676

See merge request !3420
2016-03-29 16:30:55 +00:00
Phil Hughes 31fea92295 Updated based on Ruby feedback 2016-03-29 15:26:12 +01:00
Zeger-Jan van de Weg b231742687 Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296 2016-03-29 16:14:59 +02:00
Phil Hughes c9dea7761d Added tests for upcoming milestone filter 2016-03-29 11:57:04 +01:00
Rémy Coutable 00726e4df9 Merge branch 'fix/nomethod-error-on-ci' into 'master'
Fix error when visiting CI root path

Closes #14528, closes #14687

See merge request !3377
2016-03-29 10:32:38 +00:00
Grzegorz Bizon 7b11da632a Isolate CarrierWave uploads in test enviroment 2016-03-29 10:45:22 +02:00
Douwe Maan a7ca8689f7 Merge branch 'fix-14607' into 'master'
Ensure private project snippets are not viewable by unauthorized people

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607

See merge request !1946
2016-03-29 08:21:48 +00:00
Grzegorz Bizon d6097ca402 Extend specs for build badge 2016-03-29 09:01:24 +02:00
Grzegorz Bizon 4cd1b9f4d8 Refactor builds badge, encapsulate inside a class 2016-03-29 09:01:19 +02:00
Grzegorz Bizon b7685b57d3 Redirect to root path when visiting /ci 2016-03-29 08:04:17 +02:00
Abhi Rao 762d6ab4fd Ensuring Merge Request API returns boolean values for work_in_progress
Fixes #14692
2016-03-28 22:11:44 -05:00
Dmitriy Zaporozhets 55df9a70bf Merge branch 'functional-sidebar' into 'master'
Updates sidebar to use new dropdowns for issues and merge requests

Fixes #12935, #13164 

See merge request !3175
2016-03-28 20:59:13 +00:00
Robert Speicher 8b5a8bdb25 Merge branch 'api-ability-to-backdate-newly-created-issues-12628' into 'master'
Back dating of issues when creating through the API

Closes #12628 

See merge request !3408
2016-03-28 16:31:17 +00:00
Zeger-Jan van de Weg 473b261261 Back dating of issues when creating throught the API 2016-03-28 16:45:36 +02:00
Stan Hu 2fa20f2d4f Handle nil descriptions in Slack issue messages
Closes #14676
2016-03-28 04:15:41 -07:00
Stan Hu 2e328c1ea7 Expire the exists cache before deletion to ensure project dir actually exists
Closes #14659
2016-03-27 08:52:44 -07:00