Commit Graph
26042 Commits
Author SHA1 Message Date
Stan Hu b43e059748 Don't fetch any tags from a forked repo
Closes #13957
2016-04-02 00:45:07 -07:00
Robert Speicher 82539cff70 Merge branch 'clean-up-user-controller-spec' into 'master'
Minor clean up on admin/users_controller_spec

Extracted from !3439 

See merge request !3460
2016-03-31 21:14:49 +00:00
Zeger-Jan van de Weg 340f1fc976 Minor clean up on admin/users_controller_spec 2016-03-31 22:29:32 +02:00
Jacob Schatz 1bb7a6c4ab Merge branch 'fix-input-borders' into 'master'
Fix input borders



See merge request !3474
2016-03-31 20:10:15 +00:00
Robert Speicher 3cd28c012b Merge branch 'deleted-project-still-stays-visible-and-404-issue-14138' into 'master'
Exclude projects pending deletion from all results

Closes #14138

See merge request !3439
2016-03-31 19:11:10 +00:00
Zeger-Jan van de Weg 1e7116b34d Exclude projects pending deletion from all results 2016-03-31 20:20:18 +02:00
Rémy Coutable 95c7aa62de Merge branch 'fix-todos' into 'master'
Destroy related todos when an Issue/MR is deleted

Closes #14550 

Closes #14598

See merge request !3376
2016-03-31 16:43:12 +00:00
Jacob Schatz 220b51264c Merge branch 'fix-placeholder-color' into 'master'
Fix placeholder color

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3472
2016-03-31 16:36:55 +00:00
Dmitriy Zaporozhets a4a8bfd799 Use border color variables for input
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-31 18:20:23 +02:00
Dmitriy Zaporozhets 6ed46aad15 Fix icons color in the header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-31 18:07:29 +02:00
Dmitriy Zaporozhets 80e1ce1dd7 Fix placeholder color
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-31 17:47:23 +02:00
Douglas Barbosa Alexandre f1d1dc00a9 Update CHANGELOG 2016-03-31 10:46:07 -03:00
Douglas Barbosa Alexandre db36ef60e9 Remove todos for deleted merge requests 2016-03-31 10:46:06 -03:00
Jacob Schatz c3875b5f75 Merge branch 'fix-event-row' into 'master'
Fix event rendering for certain event types

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3469
2016-03-31 11:34:26 +00:00
Jacob Schatz 403b7fe11a Merge branch 'issue_3400_port' into 'master'
Location aware search

Closes #3400 #14217

Introduces suggestion grouping on the search box and adds the ability to the user to remove the location to search on.


**Notes**
- Suggestions are now grouped by category.
- Suggestions are displayed when no location is set.
  - Would be great to provide suggestions for the specified location which could be a project or group.
- A location is set from the server for projects/groups related urls.

**Default Apparence**

![](/uploads/9fad1a354fb0e4b13cfd36698c061ab4/default.gif)

**When location badge is present**

![](/uploads/ddc6379f407061e188f9f4a7a9a8c9b8/location-badge.gif)

**Suggestions**

![suggestions](/uploads/2df288e00ad496b31a1a2efc2a4a9f6d/suggestions.gif)

**Suggestions when location badge is present**

![](/uploads/f6ef09d3aed124179ab4e228b848486e/location-present-suggestions.gif)

Closes #3400 

See merge request !3212
2016-03-31 11:33:17 +00:00
Dmitriy Zaporozhets c27b578240 Fix event rendering for certain event types
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-31 12:38:44 +02:00
Rémy Coutable 6985e7dbf9 Fix CHANGELOG
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-03-31 10:07:53 +02:00
Rémy Coutable 0af8587d88 Merge branch 'fix-commit-comment' into 'master'
Fix commit comment alignment

Closes #14780

See merge request !3466
2016-03-31 06:49:32 +00:00
Stan Hu cc56d97d21 Fix commit comment alignment
Closes #14780
2016-03-30 20:13:31 -07:00
Robert Speicher 605eae85ba Merge branch 'upgrade-coffee-rails' into 'master'
Upgrade coffee-rails to 4.1.1

Includes Rails 5 support.

[See Changelog for more info](https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md#411-dece
mber-18-2015).

Working towards #14286.

See merge request !3398
2016-03-31 00:56:38 +00: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
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
Jacob Schatz 2fb7392ed7 Merge branch '14547_todo-click' into 'master'
Make entire todo row clickable

Fixes #14547 

I had some issues with timeouts when searching for the selector to click on, so I ended up using `execute_script`. Please let me know if you think there's a better solution

See merge request !3456
2016-03-30 18:41:51 +00: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
Annabel Dunstone f79687ea97 Clear .todo listener 2016-03-30 12:28:57 -05:00
Annabel Dunstone 0591a7820b Change window.location to use turbolinks 2016-03-30 12:28:57 -05:00
Annabel Dunstone 51031a68f7 Make entire todo row clickable 2016-03-30 12:28:57 -05: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
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
Douglas Barbosa Alexandre 07e1ec5dc1 Fix error 500 when target is nil on todo list 2016-03-30 12:09:34 -03:00
Rémy Coutable 8718acdf80 Add 8.6.2 CHANGELOG items
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-03-30 16:57:15 +02:00
Grzegorz Bizon 6f0cba11da Ensure uploads dir exists when running backup specs 2016-03-30 15:40:49 +02:00
Dmitriy Zaporozhets 4a01b5e293 Merge branch 'functional-closed-sidebar' into 'master'
Functional closed sidebar

Adds functionality to include the closed sidebar.

When sidebar is closed the details will be visible once changed in open sidebar.

This MR fixes some bugs and adds some features from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3175

Fixes: #13594  

See merge request !3411
2016-03-30 12:18:26 +00:00
Grzegorz Bizon 6e747d720d Move CarrierWave test env config to separate file 2016-03-30 13:57:01 +02:00
Jacob Schatz b4ce4e6f06 Remove console logs 2016-03-30 07:26:34 -04:00
Jacob Schatz a121ee51bf Off the event initially 2016-03-30 07:26:34 -04:00
Jacob Schatz e7650492f2 Collapsed sidebar opens over instead of pushing content. 2016-03-30 07:26:34 -04:00
Jacob Schatz 509bc3fbe4 Sidebar collapse update issue 2016-03-30 07:26:34 -04:00
Jacob SchatzandJacob Schatz 697895676f User selection from collapsed sidebar 2016-03-30 07:26:09 -04:00
Jacob SchatzandJacob Schatz 750cd5c0e0 Add json response for user avatar in merge request 2016-03-30 07:26:09 -04:00
Jacob SchatzandJacob Schatz cb6192986a Make changed values visible in minimized sidebar. 2016-03-30 07:26:09 -04:00
Rémy Coutable 7b2af8740d Merge branch 'notification-settings-save' into 'master'
Fixed issue with notification settings not saving

Closes #14736

See merge request !3452
2016-03-30 08:42:13 +00:00
Phil Hughes 0a7974e584 Fixed issue with notification settings not saving
Closes #14736
2016-03-30 08:40:44 +01:00
Rémy Coutable a9346cab20 Merge branch 'rs-banzai-requires' into 'master'
Remove redundant `require`s from Banzai files

We're trying to avoid circular dependency errors.

Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/13521

Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/8/

See merge request !3391
2016-03-30 06:59:50 +00:00