Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update VERSION to 8.17.0-prev8.17.0.pre | James Lopez | 2017-01-22 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 8.16.0 | James Lopez | 2017-01-22 | 128 | -509/+130 |
| | | | [ci skip] | ||||
* | Merge branch 'mr-widget-replace-body' into 'master' | Jacob Schatz | 2017-01-22 | 1 | -1/+3 |
|\ | | | | | | | | | Replace merge request widget body See merge request !8697 | ||||
| * | Replace merge request widget bodymr-widget-replace-body | Phil Hughes | 2017-01-22 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'docs/prometheus' into 'master' | Achilleas Pipinellis | 2017-01-22 | 3 | -1/+109 |
|\ \ | | | | | | | | | | | | | Add Prometheus docs See merge request !8699 | ||||
| * | | Add information on the dashboard and exporter ports | Achilleas Pipinellis | 2017-01-22 | 1 | -1/+6 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Expose Prometheus docs to the main README | Achilleas Pipinellis | 2017-01-22 | 2 | -1/+7 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Add Prometheus docs | Achilleas Pipinellis | 2017-01-22 | 1 | -0/+97 |
| | | | | | | | | | | | | | | | | | | Replaces https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1237 Omnibus MR: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1227 Omnibus issue: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1481 | ||||
* | | | Merge branch 'merge-dropdown-this-context' into 'master' | Jacob Schatz | 2017-01-22 | 3 | -1/+46 |
|\ \ \ | |_|/ |/| | | | | | | | | Fixed bug with merge immediately button not working See merge request !8696 | ||||
| * | | Added spec testsmerge-dropdown-this-context | Phil Hughes | 2017-01-22 | 1 | -0/+41 |
| | | | |||||
| * | | Fixed bug with merge immediately button would not work | Phil Hughes | 2017-01-22 | 2 | -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ński | 2017-01-22 | 1 | -0/+76 |
|\ \ | | | | | | | | | | | | | Update autodeploy templates [ci skip] See merge request !8695 | ||||
| * | | Update autodeploy templates [ci skip] | Kamil Trzcinski | 2017-01-22 | 1 | -0/+76 |
| | | | |||||
* | | | Merge branch 'fix-upload-group-avatar' into 'master' | Stan Hu | 2017-01-22 | 2 | -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't | Jacob Schatz | 2017-01-21 | 2 | -3/+3 |
|/ / / | |||||
* | | | Merge branch 'revert-9cac0317' into 'master' | Grzegorz Bizon | 2017-01-22 | 12 | -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 Bizon | 2017-01-21 | 12 | -141/+104 |
| | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !8573 | ||||
* | | | | Merge branch ↵ | Jacob Schatz | 2017-01-21 | 1 | -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 right | Jose Ivan Vargas | 2017-01-21 | 1 | -1/+9 |
|/ / / | |||||
* | | | Merge branch 'fix_auto_merging' into 'master' | Grzegorz Bizon | 2017-01-21 | 4 | -26/+86 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix Merge When Pipeline Succeeds immediate merge bug Closes #26969 See merge request !8685 | ||||
| * | | | Add Changelog for MWPS immediate merge bugfix_auto_merging | Grzegorz Bizon | 2017-01-21 | 1 | -0/+4 |
| | | | | |||||
| * | | | Extend feature tests for merge when pipeline succeeds | Grzegorz Bizon | 2017-01-21 | 1 | -9/+51 |
| | | | | |||||
| * | | | Load ci_bundle javascripts in MWBS partial | Grzegorz Bizon | 2017-01-21 | 1 | -0/+3 |
| | | | | |||||
| * | | | Add event delegation to prevent events from not firing in certain states. | Jacob Schatz | 2017-01-21 | 1 | -17/+28 |
| | | | | |||||
* | | | | Merge branch 'issue-search-token-position' into 'master' | Jacob Schatz | 2017-01-21 | 8 | -41/+165 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Filtered search input click back at token See merge request !8617 | ||||
| * | | | | Fixed issue with multiple words not filtering correctly | Phil Hughes | 2017-01-21 | 1 | -4/+1 |
| | | | | | |||||
| * | | | | Fixed failing JS specs | Phil Hughes | 2017-01-21 | 3 | -7/+17 |
| | | | | | |||||
| * | | | | Places dropdown at cursor position | Phil Hughes | 2017-01-21 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Added comments to regex | Phil Hughes | 2017-01-21 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Fixed bug with hint not showing when in middle of text | Phil Hughes | 2017-01-21 | 4 | -22/+16 |
| | | | | | |||||
| * | | | | Fixed caret not moving correctly | Phil Hughes | 2017-01-21 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Fixed issue when label or milestone had space | Phil Hughes | 2017-01-21 | 3 | -6/+27 |
| | | | | | |||||
| * | | | | Fixed bug replacing full input value | Phil Hughes | 2017-01-21 | 2 | -6/+9 |
| | | | | | |||||
| * | | | | Added tests | Phil Hughes | 2017-01-21 | 3 | -14/+57 |
| | | | | | | | | | | | | | | | | | | | | Fixed edge cases with changing value | ||||
| * | | | | Teaspoon test fix | Phil Hughes | 2017-01-21 | 1 | -3/+18 |
| | | | | | |||||
| * | | | | Trigger filter on click | Phil Hughes | 2017-01-21 | 1 | -4/+11 |
| | | | | | |||||
| * | | | | Fixed filter issue | Phil Hughes | 2017-01-21 | 3 | -6/+6 |
| | | | | | |||||
| * | | | | Correctly replaces string when selecting in dropdown | Phil Hughes | 2017-01-21 | 3 | -24/+32 |
| | | | | | |||||
| * | | | | Opens dropdown correctly | Phil Hughes | 2017-01-21 | 4 | -17/+27 |
| | | | | | |||||
| * | | | | Filtered search input click back at token | Phil Hughes | 2017-01-21 | 2 | -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 Schatz | 2017-01-21 | 4 | -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-v1 | Eric Eastwood | 2017-01-21 | 4 | -21/+49 |
|/ / / | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/26785 | ||||
* | | | Merge branch 'revert-a91ff32b' into 'master' | Jacob Schatz | 2017-01-21 | 5 | -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 Schatz | 2017-01-21 | 5 | -46/+4 |
|/ / / | | | | | | | This reverts merge request !8475 | ||||
* | | | Merge branch 'add-index-on-ci-builds' into 'master' | Stan Hu | 2017-01-21 | 3 | -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-builds | Kamil Trzcinski | 2017-01-21 | 2 | -1/+19 |
| | | | |||||
| * | | Add index for ci_builds that makes shared runners query to run 50x faster. | Kamil Trzcinski | 2017-01-21 | 2 | -1/+19 |
| | | | |||||
* | | | Merge branch 'fix/pipeline-ref-path-serialization' into 'master' | Kamil Trzciński | 2017-01-21 | 3 | -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-serialization | Grzegorz Bizon | 2017-01-20 | 1 | -0/+4 |
| | | | | |||||
| * | | | Do not generate pipeline ref path if ref not present | Grzegorz Bizon | 2017-01-20 | 2 | -4/+18 |
| | | | |