summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added spec testsmerge-dropdown-this-contextPhil Hughes2017-01-221-0/+41
|
* Fixed bug with merge immediately button would not workPhil Hughes2017-01-222-1/+5
| | | | This was caused by using 'this' in a fat arrow function, so 'this' would not equal the jQuery element
* Merge branch 'update-auto-deploy-templates' into 'master' Kamil Trzciński2017-01-221-0/+76
|\ | | | | | | | | Update autodeploy templates [ci skip] See merge request !8695
| * Update autodeploy templates [ci skip]Kamil Trzcinski2017-01-221-0/+76
| |
* | Merge branch 'fix-upload-group-avatar' into 'master' Stan Hu2017-01-222-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Button by itself will submit forms. Button type button willn't Closes #26999 See merge request !8694
| * | Button by itself will submit forms. Button type button willn'tJacob Schatz2017-01-212-3/+3
|/ /
* | Merge branch 'revert-9cac0317' into 'master' Grzegorz Bizon2017-01-2212-141/+104
|\ \ | | | | | | | | | | | | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'master'" See merge request !8690
| * | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into ↵Grzegorz Bizon2017-01-2112-141/+104
| | | | | | | | | | | | | | | 'master'" This reverts merge request !8573
* | | Merge branch ↵Jacob Schatz2017-01-211-1/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | '26618-search-bar-dropdown-offset-should-not-go-past-search-bar-input' into 'master' Introduced an offset limit to prevent the dropdown from going far right Closes #26618 and #27023 See merge request !8679
| * | Introduced an offset limit to prevent the dropdown from going far rightJose Ivan Vargas2017-01-211-1/+9
|/ /
* | Merge branch 'fix_auto_merging' into 'master' Grzegorz Bizon2017-01-214-26/+86
|\ \ | | | | | | | | | | | | | | | | | | Fix Merge When Pipeline Succeeds immediate merge bug Closes #26969 See merge request !8685
| * | Add Changelog for MWPS immediate merge bugfix_auto_mergingGrzegorz Bizon2017-01-211-0/+4
| | |
| * | Extend feature tests for merge when pipeline succeedsGrzegorz Bizon2017-01-211-9/+51
| | |
| * | Load ci_bundle javascripts in MWBS partialGrzegorz Bizon2017-01-211-0/+3
| | |
| * | Add event delegation to prevent events from not firing in certain states.Jacob Schatz2017-01-211-17/+28
| | |
* | | Merge branch 'issue-search-token-position' into 'master' Jacob Schatz2017-01-218-41/+165
|\ \ \ | | | | | | | | | | | | | | | | Filtered search input click back at token See merge request !8617
| * | | Fixed issue with multiple words not filtering correctlyPhil Hughes2017-01-211-4/+1
| | | |
| * | | Fixed failing JS specsPhil Hughes2017-01-213-7/+17
| | | |
| * | | Places dropdown at cursor positionPhil Hughes2017-01-211-1/+2
| | | |
| * | | Added comments to regexPhil Hughes2017-01-211-0/+2
| | | |
| * | | Fixed bug with hint not showing when in middle of textPhil Hughes2017-01-214-22/+16
| | | |
| * | | Fixed caret not moving correctlyPhil Hughes2017-01-212-2/+2
| | | |
| * | | Fixed issue when label or milestone had spacePhil Hughes2017-01-213-6/+27
| | | |
| * | | Fixed bug replacing full input valuePhil Hughes2017-01-212-6/+9
| | | |
| * | | Added testsPhil Hughes2017-01-213-14/+57
| | | | | | | | | | | | | | | | Fixed edge cases with changing value
| * | | Teaspoon test fixPhil Hughes2017-01-211-3/+18
| | | |
| * | | Trigger filter on clickPhil Hughes2017-01-211-4/+11
| | | |
| * | | Fixed filter issuePhil Hughes2017-01-213-6/+6
| | | |
| * | | Correctly replaces string when selecting in dropdownPhil Hughes2017-01-213-24/+32
| | | |
| * | | Opens dropdown correctlyPhil Hughes2017-01-214-17/+27
| | | |
| * | | Filtered search input click back at tokenPhil Hughes2017-01-212-2/+15
| |/ / | | | | | | | | | Allows the user to click back around the filtered search input to change the previously searched terms
* | | Merge branch '26785-fix-droplab-in-ie-11-v1' into 'master' Jacob Schatz2017-01-214-21/+49
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix DropLab in IE11 v1 (merge edition) Closes #26785 See merge request !8689
| * | Fix DropLab in IE11 v126785-fix-droplab-in-ie-11-v1Eric Eastwood2017-01-214-21/+49
|/ / | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/26785
* | Merge branch 'revert-a91ff32b' into 'master' Jacob Schatz2017-01-215-46/+4
|\ \ | | | | | | | | | | | | Revert "Merge branch '25709-diff-file-overflow' into 'master'" See merge request !8688
| * | Revert "Merge branch '25709-diff-file-overflow' into 'master'"Jacob Schatz2017-01-215-46/+4
|/ / | | | | This reverts merge request !8475
* | Merge branch 'add-index-on-ci-builds' into 'master' Stan Hu2017-01-213-1/+37
|\ \ | |/ | | | | | | Add index for ci_builds that makes shared runners query to run 100x faster. See merge request !8683
| * Add index for ci_runners if they are sharedadd-index-on-ci-buildsKamil Trzcinski2017-01-212-1/+19
| |
| * Add index for ci_builds that makes shared runners query to run 50x faster.Kamil Trzcinski2017-01-212-1/+19
| |
* | Merge branch 'fix/pipeline-ref-path-serialization' into 'master' Kamil Trzciński2017-01-213-4/+22
|\ \ | | | | | | | | | | | | | | | | | | Do not generate pipeline ref path if ref not present Closes #26861 See merge request !8658
| * | Add Changelog entry for pipeline ref path error fixfix/pipeline-ref-path-serializationGrzegorz Bizon2017-01-201-0/+4
| | |
| * | Do not generate pipeline ref path if ref not presentGrzegorz Bizon2017-01-202-4/+18
| | |
* | | Merge branch 'revert-611917ec' into 'master' Jacob Schatz2017-01-214-48/+21
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch '26785-fix-droplab-in-ie-11-v1' into 'master'" See merge request !8680
| * | | Revert "Merge branch '26785-fix-droplab-in-ie-11-v1' into 'master'"Jacob Schatz2017-01-214-48/+21
|/ / / | | | | | | This reverts merge request !8675
* | | Merge branch '26785-fix-droplab-in-ie-11-v1' into 'master' Jacob Schatz2017-01-214-21/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix DropLab in IE11 - v1 Closes #26785 See merge request !8675
| * | | Fix DropLab in IE11 v1Eric Eastwood2017-01-204-21/+48
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/26785
* | | | Merge branch ↵Jacob Schatz2017-01-211-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26623-search-bar-dropdown-doesn-t-load-when-you-go-back-in-browser-history' into 'master' Fixed search component not instantiating back when pressing the back button on the issue page Closes #26623 See merge request !8676
| * | | | Fixed search component not instantiating back when pressing the back button ↵26623-search-bar-dropdown-doesn-t-load-when-you-go-back-in-browser-historyJose Ivan Vargas2017-01-201-0/+10
| | | | | | | | | | | | | | | | | | | | on the issue page
* | | | | Merge branch '26955-handle-legacy-issue-filter-params' into 'master' Jacob Schatz2017-01-213-1/+37
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Filter issues input does not show assignee name when there is an assignee ID in the URL" Closes #26955 See merge request !8674
| * | | | pass username and id associations needed in the frontend26955-handle-legacy-issue-filter-paramsMike Greiling2017-01-203-19/+37
| | | | |
| * | | | automatically redirect urls containing author_id or assignee_idMike Greiling2017-01-201-0/+18
| | | | |