Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-04-04Merge branch 'issue_14853' into 'master' Yorick Peterse
Fix bug related to filtering Issues by Label/Milestone. See merge request !3499
2016-04-02 Fix bug related to filtering Issues by Label/Milestone.Rubén Dávila
This problem only was affecting the dev env.
2016-04-02Merge branch 'new-navigation-prototype' into 'master' Dmitriy Zaporozhets
Two level hierarchy in navigation sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3494
2016-04-02Fix milestones tab active state and testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01Fix some active tab tests that are broken because of 2 level sidebarDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-01Remove tests with back buttonDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-31Tests updatePhil Hughes
2016-03-31Merge branch 'issue_3400_port' into 'master' Jacob Schatz
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-30Clear .todo listenerAnnabel Dunstone
2016-03-30Make entire todo row clickableAnnabel Dunstone
2016-03-27Fix broken specAlfredo Sumaran
2016-03-23Fixed failing testsPhil Hughes
2016-03-21Merge branch 'issues-show-performance' into 'master' Robert Speicher
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-21Create SSH keys for SSH clone Spinach testsYorick Peterse
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-20Fix specs and remove unnecessary console.logStan Hu
2016-03-19Create repositories in Spinach issues testsYorick Peterse
Similar to ad90dba5185e30883d5ad6008c166b0df0108ebf we always have a repository in the real world, so let's also create one in our Spinach tests.
2016-03-18Merge branch 'fix-mr-close-button' into 'master' Jacob Schatz
Fixes issue with close button not working on MR Closes #14383 See merge request !3295
2016-03-18Added testPhil Hughes
2016-03-18Merge branch 'confidential-issues' into 'master' Douwe Maan
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-18Merge branch 'optimistic-todos' into 'master' Jacob Schatz
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-18Improve award emoji test reliability by checking that the emoji is displayedStan Hu
before the search field is focused
2016-03-18Restrict access to confidential issues on activity feedDouglas Barbosa Alexandre
2016-03-17Fixed failing testsPhil Hughes
2016-03-17Reuse `no_cache_headers` method in badges controllerGrzegorz Bizon
2016-03-17Fix wiki search results point to raw sourceHiroyuki Sato
2016-03-16Merge branch 'fix-capybara-deprecation-warnings' into 'master' Robert Speicher
Fix Capybara 2.6.2 deprecation warnings See merge request !3236
2016-03-15Fix Capybara 2.6.2 deprecation warningsStan Hu
2016-03-15Improving the original label-subscribing implementationRémy Coutable
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-15Original implementation to allow users to subscribe to labelsTimothy Andrew
1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
2016-03-15Merge branch 'revert-avatar-cropping' into 'master' Rémy Coutable
Revert the avatar cropping feature Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping See merge request !3223
2016-03-15Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master' Douwe Maan
Fixes "iid of max iid" in Issuable sidebar for merged MR Fixes #13928. See merge request !3046
2016-03-15Merge branch 'application-settings' into 'master' Robert Speicher
Applications tab on profile settings Closes #13855 See merge request !3031
2016-03-15Revert "Merge branch 'avatar-cropping' into 'master' "Rémy Coutable
This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
2016-03-15Merge branch 'fix-commit-status-rendering' into 'master' Robert Speicher
Cleanup Ci::Commit, Ci::Build and CommitStatus views This MR tries to do first sweep of cleanups to Ci::Commit and Ci::Build objects removing all view-related functions and fixing the API from other side. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046 See merge request !2760
2016-03-14Merge branch 'improve-award-emoji-spec' into 'master' Douwe Maan
Improve award emoji test reliability and eliminate sleeps Closes #14129 See merge request !3195
2016-03-14Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets
Bring from EE: Share Project with Group - [x] Models and migrations - [x] Logic, UI - [x] Tests - [x] Documentation - [x] Share with group lock - [x] Api feature - [x] Api docs - [x] Api tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #12831 cc @DouweM @rspeicher @vsizov See merge request !3186
2016-03-14Merge branch 'issue-filter-tests' into 'master' Robert Speicher
Fixed tests for MR & issue filters See merge request !3203
2016-03-14Merge branch 'remove-sleeps-from-network-graph-spec' into 'master' Robert Speicher
Remove sleeps from network graph feature spec Also removed a double negative in the step description See merge request !3199
2016-03-14Fixed tests for MR & issue filtersPhil Hughes
2016-03-14Cleanup CiCommit and CiBuildKamil Trzcinski
- Remove all view related methods from Ci::Build and CommitStatus - Remove unused Ci::Commit and Ci::Build methods - Use polymorphism to render different types of CommitStatus
2016-03-14Remove sleeps from network graph feature specStan Hu
2016-03-14Use Capybara find methods and remove sleeps in feature specs in "All Issues" ↵Stan Hu
filter
2016-03-13Improve award emoji test reliability and eliminate sleepsStan Hu
Closes #14129
2016-03-12Bring shared project feature tests from EEDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11Merge branch 'group-activity-separate-tab' into 'master' Robert Speicher
Move group activity feed to separate page for consistency with dashboard and project pages Fixes #14161. Part of #13480 See merge request !3157
2016-03-11Add finders logic and tests for shared projects featureDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11Merge branch 'award-emoji-design-update' into 'master' Jacob Schatz
Updated UI of award emoji Closes #13878 See merge request !3028
2016-03-11Merge branch 'account-settings' into 'master' Jacob Schatz
Account settings Closes #13854 ![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4802a7b4f74f17d25a611ed1a2200445/account-settings.png) See merge request !3039
2016-03-11Merge branch 'comment-discard-button' into 'master' Jacob Schatz
Added discard button to comment form Also changed the labels on the buttons to better match the action they are completing. Closes #8057 See merge request !3085
2016-03-11Merge branch 'comment-error' into 'master' Dmitriy Zaporozhets
Add error for ajax:error when submitting comments Fixes #13814 ![Screen_Shot_2016-02-25_at_1.54.56_PM](/uploads/d70d706d306079df1b00d70f09affb63/Screen_Shot_2016-02-25_at_1.54.56_PM.png) cc @dblessing See merge request !2976