Commit Graph
1411 Commits
Author SHA1 Message Date
Yorick Peterse 31e28ebceb Load related MRs/branches asynchronously
Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949
2016-04-13 17:24:21 +02:00
Douglas Barbosa Alexandre 9a44d6977a Merge branch 'master' into decouple-member-notification 2016-04-11 10:34:49 -03:00
Jacob Schatz 69a8bf367c Merge branch 'mr-ui-update' into 'master'
Updated UI for new merge request

Closes #2540 

![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png)

![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png)

See merge request !3228
2016-04-11 11:25:40 +00:00
Phil Hughes 643fe43d78 Addressed feedback
Removed important from css
2016-04-11 09:43:59 +01:00
Jacob Schatz 283ecf6e48 Merge branch 'redesign_labels_page' into 'master'
Redesign labels page

closes #14227 

## Desktop
![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png)

## Mobile
![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png)

See merge request !3507
2016-04-10 14:05:22 +00:00
Douglas Barbosa Alexandre 7afeace354 Merge branch 'master' into decouple-member-notification 2016-04-08 15:48:09 -03:00
Annabel Dunstone d76878b960 Diff touch ups 2016-04-07 15:33:18 -07:00
Annabel Dunstone dab4ac54b6 Diff design updates 2016-04-07 15:33:18 -07:00
Annabel Dunstone 87b3c73ea5 Update diff_comments tests 2016-04-07 15:33:18 -07:00
Jacob Schatz f2b7cd4435 Revert "Merge branch 'new-navigation-prototype' into 'master'"
This reverts merge request !3494
2016-04-07 21:20:16 +00:00
Douglas Barbosa Alexandre bb5bc90ab0 Update number of Todos in the sidebar when it's marked as "Done" 2016-04-07 12:35:25 -03:00
Phil Hughes 1ca627f782 Fixed tests 2016-04-07 16:10:44 +01:00
Arinde Eniola ffe2f8e679 fix the failing tests and some changes 2016-04-06 20:27:30 +01:00
Phil Hughes 017ed4ae37 Fixed builds 2016-04-06 12:52:07 +01:00
Phil Hughes b310058998 Use new dropdowns for MR compare 2016-04-06 11:08:40 +01:00
Phil Hughes 7fe19046d6 Fixed failing tests 2016-04-06 11:08:40 +01:00
Jacob Schatz 4258589d95 Merge branch 'note-form-design' into 'master'
Notes form design update

Part of #3401

See merge request !3442
2016-04-05 19:34:16 +00:00
connorshea b9abf938ed Wrap images in discussions and wikis with a link to the image source using ImageLinkFilter.
Resolves #14411.

See merge request !3464
2016-04-04 19:44:07 -06:00
Phil Hughes 1f50833430 Updated tests 2016-04-04 10:48:49 +01:00
Phil Hughes ccc64676a9 Commits comment test update 2016-04-04 10:48:49 +01:00
Phil Hughes 29f414aa5a Tests update 2016-04-04 10:48:49 +01:00
Yorick Peterse 3dd91f55a0 Merge branch 'issue_14853' into 'master'
Fix bug related to filtering Issues by Label/Milestone.

See merge request !3499
2016-04-04 09:05:57 +00:00
Rubén Dávila fd090a2fab Fix bug related to filtering Issues by Label/Milestone.
This problem only was affecting the dev env.
2016-04-02 07:36:41 -05:00
Dmitriy Zaporozhets 2ed6cd9e46 Merge branch 'new-navigation-prototype' into 'master'
Two level hierarchy  in navigation sidebar

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

See merge request !3494
2016-04-02 10:20:17 +00:00
Dmitriy Zaporozhets 31b27adeb8 Fix milestones tab active state and tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-02 11:26:46 +02:00
Dmitriy Zaporozhets 847940516b Fix some active tab tests that are broken because of 2 level sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01 22:35:49 +02:00
Dmitriy Zaporozhets 22479fd0ae Remove tests with back button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01 19:53:29 +02:00
Phil Hughes d0c08cc5e0 Tests update 2016-03-31 12:58:50 +01: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
Annabel Dunstone f79687ea97 Clear .todo listener 2016-03-30 12:28:57 -05:00
Annabel Dunstone 51031a68f7 Make entire todo row clickable 2016-03-30 12:28:57 -05:00
Dmitriy Zaporozhets 065faac3a3 Test changing notification settings per project fron notificaitons page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Alfredo Sumaran c1e7351b4a Fix broken spec 2016-03-27 12:18:21 -05:00
Phil Hughes bb0a4c057f Fixed failing tests 2016-03-23 10:40:07 +00:00
Robert Speicher ffc3acd498 Merge branch 'issues-show-performance' into 'master'
Improve performance of viewing individual issues

This MR does two things:

1. `Issue#related_branches` no longer performs Git operations that aren't needed
2. The output of `Repository#exists?` is now cached and flushed properly

Combined these two changes should further cut down the amount of Git operations performed when viewing individual issues (and possibly other pages).

See merge request !3296
2016-03-21 14:42:25 +00:00
Yorick Peterse 75aaf91cb1 Create SSH keys for SSH clone Spinach tests
These tests would check if the "This project is empty" banner would
contain SSH clone URLs. Oddly enough this should have never passed (as
far as I can tell) as SSH clone URLs in this banner are _only_ displayed
if the current user has at least 1 SSH key attached. Since the tests
never seem to create any they never should have passed, yet somehow they
did. To solve this the Spinach tests in question now ensure at least 1
SSH key is present.
2016-03-21 11:40:13 +01:00
Stan Hu 91f9866cce Fix specs and remove unnecessary console.log 2016-03-20 05:53:43 -07:00
Yorick Peterse fc5ff7af61 Create repositories in Spinach issues tests
Similar to ad90dba5185e30883d5ad6008c166b0df0108ebf we always have a
repository in the real world, so let's also create one in our Spinach
tests.
2016-03-19 21:54:08 +01:00
Jacob Schatz 9280fd4acd Merge branch 'fix-mr-close-button' into 'master'
Fixes issue with close button not working on MR

Closes #14383

See merge request !3295
2016-03-18 14:49:00 +00:00
Phil Hughes 195ef985f3 Added test 2016-03-18 12:42:30 +00:00
Douwe Maan 9813eac56b Merge branch 'confidential-issues' into 'master'
Add confidential issues

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

More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227

See merge request !3282
2016-03-18 12:04:56 +00:00
Jacob Schatz 4cd87d31bd Merge branch 'optimistic-todos' into 'master'
Adds small AJAX optimistic functionality to todos.

Fixes #13656 <br/>
A good first step and boring solution. <br/>
Will make ajax call to remove each issue.  <br/>
If issue is last in group of issues will refresh page.  <br/>
If issues remain in group will remove row with JS.  <br/>
Adds loading spinner to button and disables. <br/>

![todos-optimistic](/uploads/c6aec4a688e5125d4df55a2a3a55d4d7/todos-optimistic.gif) <br/>

cc @dzaporozhets @JobV @dbalexandre 

See merge request !2946
2016-03-18 11:23:16 +00:00
Stan Hu 0901d51724 Improve award emoji test reliability by checking that the emoji is displayed
before the search field is focused
2016-03-17 17:34:15 -07:00
Douglas Barbosa Alexandre 9222459ea3 Restrict access to confidential issues on activity feed 2016-03-17 20:56:00 -03:00
Phil Hughes ceaa694391 Fixed failing tests 2016-03-17 15:10:45 +00:00
Grzegorz Bizon 019fed0f72 Reuse no_cache_headers method in badges controller 2016-03-17 12:16:34 +01:00
Hiroyuki Sato f0b052e168 Fix wiki search results point to raw source 2016-03-17 08:58:52 +09: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
Stan Hu 7c61bdcf6f Fix Capybara 2.6.2 deprecation warnings 2016-03-15 11:03:17 -07:00
Rémy Coutable 54ec7e9599 Improving the original label-subscribing implementation
1. Make the "subscribed" text in Issuable sidebar reflect the labels
   subscription status

2. Current user mut be logged-in to toggle issue/MR/label subscription
2016-03-15 18:22:02 +01:00