summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixes issue with unassigned not working in dropdownzero-dropdown-idPhil Hughes2016-03-142-2/+2
| | | | Also allowed issues to be bulk unassigned
* Merge branch 'improve-award-emoji-spec' into 'master' Douwe Maan2016-03-141-4/+1
|\ | | | | | | | | | | | | Improve award emoji test reliability and eliminate sleeps Closes #14129 See merge request !3195
| * Improve award emoji test reliability and eliminate sleepsimprove-award-emoji-specStan Hu2016-03-131-4/+1
| | | | | | | | Closes #14129
* | Merge branch 'nav-over-content-mobile' into 'master' Jacob Schatz2016-03-145-43/+66
|\ \ | | | | | | | | | | | | | | | | | | Left sidebar overlaps the content on mobile devices On mobile, the navigation sidebar will always revert to being hidden. When clicking the toggle, it will then go over the top of the content - rather than push the content. See merge request !3087
| * | Removed call to setup from breakpoint size methodnav-over-content-mobilePhil Hughes2016-03-141-5/+5
| | |
| * | Changed breakpoint sizePhil Hughes2016-03-145-28/+34
| | | | | | | | | | | | Changed breakpoint class into singleton
| * | removed un-used function callPhil Hughes2016-03-141-3/+3
| | |
| * | Created bootstrap breakpoint classPhil Hughes2016-03-145-37/+41
| | | | | | | | | | | | This class checks the current bootstrap breakpoint
| * | changed jquery document readyPhil Hughes2016-03-141-1/+1
| | |
| * | Removed deprecated bootstrap variablesPhil Hughes2016-03-141-2/+2
| | |
| * | Left sidebar overlaps the content on mobile devicesPhil Hughes2016-03-143-11/+24
| | |
* | | Merge branch 'rs-note-active-spec' into 'master'Robert Speicher2016-03-142-13/+82
|\ \ \ | | | | | | | | | | | | | | | | | | | | Add unit specs for `Note#active?` See merge request !3133
| * | | Add unit specs for `Note#active?`rs-note-active-specRobert Speicher2016-03-112-13/+82
| | | |
* | | | Merge branch 'updated-project-home-icon' into 'master' Jacob Schatz2016-03-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed project home icon Closes #14196 ![Screen_Shot_2016-03-14_at_16.01.48](/uploads/0039c0c3afe0bf560368d2b910e2a93f/Screen_Shot_2016-03-14_at_16.01.48.png) See merge request !3207
| * | | | Changed project home iconPhil Hughes2016-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #14196
* | | | | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-1444-11/+626
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Bring share project with group API from EEshare-project-ceDmitriy Zaporozhets2016-03-134-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Render project members from shared groupDmitriy Zaporozhets2016-03-123-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Bring share with group feature documentation from EEDmitriy Zaporozhets2016-03-127-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Bring shared project feature tests from EEDmitriy Zaporozhets2016-03-126-1/+125
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add share project from group lockDmitriy Zaporozhets2016-03-115-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add finders logic and tests for shared projects featureDmitriy Zaporozhets2016-03-115-2/+86
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Allow users to access project shared with their groupDmitriy Zaporozhets2016-03-111-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Show shared projects on group pageDmitriy Zaporozhets2016-03-113-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add functionality to setup share of project with group via project settingsDmitriy Zaporozhets2016-03-116-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Bring ProjectGroupLink model and migrations from EEDmitriy Zaporozhets2016-03-118-3/+89
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'rs-prepare-8-6' into 'master' Robert Speicher2016-03-143-3/+167
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare docs for 8.6 RC1 [ci skip] See merge request !3173
| * | | | | | Update GITLAB_SHELL_VERSION to match EERobert Speicher2016-03-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Fix ordering in 8.5-to-8.6 update guiders-prepare-8-6Robert Speicher2016-03-121-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Added 8.6 upgrade guide for PostgreSQL usersYorick Peterse2016-03-111-0/+17
| | | | | | |
| * | | | | | Prepare docs for 8.6 RC1Robert Speicher2016-03-102-2/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'rs-snippet-expires-api' into 'master' Robert Speicher2016-03-145-0/+24
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't remove `ProjectSnippet#expires_at` from API See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53. See merge request !3144
| * | | | | | Don't remove `ProjectSnippet#expires_at` from APIrs-snippet-expires-apiRobert Speicher2016-03-095-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53.
* | | | | | | Merge branch 'issue-filter-tests' into 'master' Robert Speicher2016-03-144-20/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed tests for MR & issue filters See merge request !3203
| * | | | | | | Fixed tests for MR & issue filtersissue-filter-testsPhil Hughes2016-03-144-20/+14
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'remove-sleeps-from-network-graph-spec' into 'master' Robert Speicher2016-03-142-5/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove sleeps from network graph feature spec Also removed a double negative in the step description See merge request !3199
| * | | | | | Remove sleeps from network graph feature specStan Hu2016-03-132-5/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'improve-issues-filter-all-spec' into 'master' Dmitriy Zaporozhets2016-03-142-9/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Capybara find methods and remove sleeps in feature specs in "All Issues" filter Fixes sporadic build failures (e.g. https://gitlab.com/gitlab-org/gitlab-ce/builds/856233) See merge request !3198
| * | | | | | Use Capybara find methods and remove sleeps in feature specs in "All Issues" ↵improve-issues-filter-all-specStan Hu2016-03-132-9/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | filter
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-03-145-23/+20
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'redirect-host-check' into 'master' Douwe Maan2016-03-135-23/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect host check Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2649 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13956 See merge request !1945
| | * | | | | | Fix denting and specZeger-Jan van de Weg2016-03-133-4/+4
| | | | | | | |
| | * | | | | | ContinueToParams -> ContinueParamsZeger-Jan van de Weg2016-03-134-4/+5
| | | | | | | |
| | * | | | | | Check redirect path in the continue_paramsZeger-Jan van de Weg2016-03-133-21/+17
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2649 https://gitlab.com/gitlab-org/gitlab-ce/issues/13956
* | | | | | | Merge branch 'upcoming' into 'master' Douwe Maan2016-03-134-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements upcoming filter in milstones ![Imgur](http://i.imgur.com/Oc2LZrF.png) @DouweM @JobV I think this is what you wanted :) Lemme know if it there is something that need changing Had alot of fun doing it! Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14102 See merge request !3148
| * | | | | | | fixes small issuestiagonbotelho2016-03-132-3/+2
| | | | | | | |
| * | | | | | | removes tab and replaces with space in changelogtiagonbotelho2016-03-121-0/+1
| | | | | | | |
| * | | | | | | adds my name to changelogtiagonbotelho2016-03-121-0/+1
| | | | | | | |
| * | | | | | | fixes issuestiagonbotelho2016-03-122-5/+4
| | | | | | | |
| * | | | | | | fixes issues for mr acceptancetiagonbotelho2016-03-122-8/+12
| | | | | | | |