summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Load related MRs/branches asynchronouslyYorick Peterse2016-04-131-2/+5
| | | | | | | | | | | | 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
* Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-117-17/+26
|\
| * Merge branch 'mr-ui-update' into 'master' Jacob Schatz2016-04-115-15/+24
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Addressed feedbackPhil Hughes2016-04-111-1/+0
| | | | | | | | | | | | Removed important from css
| | * Fixed testsPhil Hughes2016-04-071-1/+1
| | |
| | * Fixed buildsPhil Hughes2016-04-064-11/+21
| | |
| | * Use new dropdowns for MR comparePhil Hughes2016-04-061-2/+2
| | |
| | * Fixed failing testsPhil Hughes2016-04-061-2/+2
| | |
| * | Merge branch 'redesign_labels_page' into 'master' Jacob Schatz2016-04-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | fix the failing tests and some changesArinde Eniola2016-04-061-1/+1
| | |/
| * | Diff touch upsAnnabel Dunstone2016-04-071-0/+1
| | |
| * | Diff design updatesAnnabel Dunstone2016-04-072-6/+5
| | |
| * | Update diff_comments testsAnnabel Dunstone2016-04-072-5/+5
| | |
* | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-089-14/+55
|\ \ \ | |/ /
| * | Revert "Merge branch 'new-navigation-prototype' into 'master'"Jacob Schatz2016-04-078-11/+30
| | | | | | | | | This reverts merge request !3494
| * | Update number of Todos in the sidebar when it's marked as "Done"Douglas Barbosa Alexandre2016-04-071-0/+2
| |/
| * Merge branch 'note-form-design' into 'master' Jacob Schatz2016-04-052-4/+4
| |\ | | | | | | | | | | | | | | | | | | Notes form design update Part of #3401 See merge request !3442
| | * Updated testsPhil Hughes2016-04-041-1/+1
| | |
| | * Commits comment test updatePhil Hughes2016-04-041-1/+1
| | |
| | * Tests updatePhil Hughes2016-04-041-2/+2
| | |
| * | Wrap images in discussions and wikis with a link to the image source using ↵connorshea2016-04-041-1/+1
| |/ | | | | | | | | | | | | | | ImageLinkFilter. Resolves #14411. See merge request !3464
| * Merge branch 'issue_14853' into 'master' Yorick Peterse2016-04-042-0/+27
| |\ | | | | | | | | | | | | Fix bug related to filtering Issues by Label/Milestone. See merge request !3499
| | * Fix bug related to filtering Issues by Label/Milestone.issue_14853Rubén Dávila2016-04-022-0/+27
| | | | | | | | | | | | This problem only was affecting the dev env.
| * | Merge branch 'new-navigation-prototype' into 'master' Dmitriy Zaporozhets2016-04-028-30/+11
| |\ \ | | |/ | |/| | | | | | | | | | | | | Two level hierarchy in navigation sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3494
| | * Fix milestones tab active state and testsnew-navigation-prototypeDmitriy Zaporozhets2016-04-024-5/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Fix some active tab tests that are broken because of 2 level sidebarDmitriy Zaporozhets2016-04-013-3/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Remove tests with back buttonDmitriy Zaporozhets2016-04-014-25/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Tests updatePhil Hughes2016-03-311-4/+4
| |/
| * Merge branch 'issue_3400_port' into 'master' Jacob Schatz2016-03-311-5/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Fix broken specAlfredo Sumaran2016-03-271-5/+4
| | |
| * | Clear .todo listener14547_todo-clickAnnabel Dunstone2016-03-301-1/+1
| | |
| * | Make entire todo row clickableAnnabel Dunstone2016-03-302-0/+13
| |/
* | Test changing notification settings per project fron notificaitons pageDmitriy Zaporozhets2016-03-302-0/+16
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fixed failing testsPhil Hughes2016-03-231-2/+2
|
* Merge branch 'issues-show-performance' into 'master' Robert Speicher2016-03-212-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Create SSH keys for SSH clone Spinach testsissues-show-performanceYorick Peterse2016-03-212-0/+2
| | | | | | | | | | | | | | | | | | | | 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.
| * Create repositories in Spinach issues testsYorick Peterse2016-03-191-1/+1
| | | | | | | | | | | | Similar to ad90dba5185e30883d5ad6008c166b0df0108ebf we always have a repository in the real world, so let's also create one in our Spinach tests.
* | Fix specs and remove unnecessary console.logStan Hu2016-03-201-2/+2
|/
* Merge branch 'fix-mr-close-button' into 'master' Jacob Schatz2016-03-181-0/+8
|\ | | | | | | | | | | | | Fixes issue with close button not working on MR Closes #14383 See merge request !3295
| * Added testPhil Hughes2016-03-181-0/+8
| |
* | Merge branch 'confidential-issues' into 'master' Douwe Maan2016-03-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Restrict access to confidential issues on activity feedDouglas Barbosa Alexandre2016-03-171-1/+1
| | |
* | | Merge branch 'optimistic-todos' into 'master' Jacob Schatz2016-03-181-1/+0
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fixed failing testsoptimistic-todosPhil Hughes2016-03-171-1/+0
| | |
* | | Improve award emoji test reliability by checking that the emoji is displayedStan Hu2016-03-172-4/+11
| |/ |/| | | | | before the search field is focused
* | Reuse `no_cache_headers` method in badges controllerGrzegorz Bizon2016-03-171-1/+1
|/
* Fix wiki search results point to raw sourceHiroyuki Sato2016-03-171-1/+1
|
* Merge branch 'fix-capybara-deprecation-warnings' into 'master' Robert Speicher2016-03-161-1/+1
|\ | | | | | | | | Fix Capybara 2.6.2 deprecation warnings See merge request !3236
| * Fix Capybara 2.6.2 deprecation warningsStan Hu2016-03-151-1/+1
| |
* | Improving the original label-subscribing implementationRémy Coutable2016-03-152-11/+10
| | | | | | | | | | | | | | 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