summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'issuable-form-create-label-sub-groups' into 'master'Filipa Lacerda2017-05-263-1/+36
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed create new label form in issue form not working for sub-group projects Closes #32906 See merge request !11703
| * | | | | | Fixed create new label form in issue form not working for sub-group projectsissuable-form-create-label-sub-groupsPhil Hughes2017-05-253-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #32906
* | | | | | | Merge branch 'fix-counter-cache-for-acts-as-taggable' into 'master'Stan Hu2017-05-262-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Counter Cache not being disabled for acts-on-taggable Closes #30582 See merge request !11727
| * | | | | | | Fix Counter Cache not being disabled for acts-on-taggablefix-counter-cache-for-acts-as-taggableKamil Trzcinski2017-05-262-0/+8
| | | | | | | |
* | | | | | | | Merge branch '31448-jira-urls' into 'master'Grzegorz Bizon2017-05-266-54/+156
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API URL to JIRA settings Closes #31448 See merge request !11707
| * | | | | | | | Add API URL to JIRA settings31448-jira-urlsJarka Kadlecova2017-05-266-54/+156
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'diffcollection-no-restarts' into 'master'Douwe Maan2017-05-262-21/+58
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix buffering in DiffCollection See merge request !11659
| * | | | | | | | Use the iterator inside DiffCollection only onceJacob Vosmaer2017-05-241-18/+21
| | | | | | | | |
| * | | | | | | | Add test that shows DiffCollection restart bugJacob Vosmaer2017-05-231-3/+37
| | | | | | | | |
* | | | | | | | | Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into ↵Clement Ho2017-05-262-2/+45
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error thrown with missing note fragment in DOM Closes #32888 See merge request !11700
| * | | | | | | | Fix error thrown with missing note fragment in DOM32888-fix-error-after-missing-note-hash-fragment-in-domEric Eastwood2017-05-262-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32888 Reproduction: 1. Visit /namespace/project/merge_requests/x/diffs#note_1234 1. When `#note_1234` isn't in the diff, an error is thrown
* | | | | | | | | Merge branch 'fix-emoji-menu-z-index' into 'master'Annabel Dunstone Gray2017-05-261-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set emoji-menu z-index to 200 Closes #32632 See merge request !11686
| * | | | | | | | | Set emoji-menu z-index to 200Luke "Jared" Bennett2017-05-261-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch '32683-resolved-discussions-icon-is-misaligned' into 'master'Annabel Dunstone Gray2017-05-261-1/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Resolved discussions icon is misaligned" Closes #32683 See merge request !11711
| * | | | | | | | | Resolve "Resolved discussions icon is misaligned"Luke "Jared" Bennett2017-05-261-1/+9
|/ / / / / / / / /
* | | | | | | | | Merge branch '32851-postgres-min-version' into 'master'Douwe Maan2017-05-264-3/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop support for postgresql 9.1 in GitLab 9.3 Closes #32851 See merge request !11677
| * | | | | | | | | Minimum postgresql version is now 9.2Nick Thomas2017-05-264-3/+8
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'locale-region-fix' into 'master'Douwe Maan2017-05-261-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed locale frontend not picking up regions Closes #32913 See merge request !11717
| * | | | | | | | Fixed locale frontend not picking up regionslocale-region-fixPhil Hughes2017-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by a webpack config issue that would only look in folders that only had lower case letters. This has been changed to include any word character Closes #32913
* | | | | | | | | Merge branch 'zj-docs-on-pipeline-schedules' into 'master'32962-diff-tab-shows-a-loading-spinnerAchilleas Pipinellis2017-05-261-19/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trigger docs job See merge request !11574
| * | | | | | | | | Remove trigger docs jobzj-docs-on-pipeline-schedulesZ.J. van de Weg2017-05-201-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to trigger pipelines no more, as now these will be triggered using pipeline schedules. See https://gitlab.com/gitlab-com/gitlab-docs/pipeline_schedules
* | | | | | | | | | Merge branch '31556-ci-coverage-paralel-rspec' into 'master'Kamil Trzciński2017-05-263-24/+74
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the last coverage in trace stream Closes #31556 See merge request !11128
| * | | | | | | | | | Resolve static analysys. Use until instead of negative whileShinya Maeda2017-05-251-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Adopt ayufan scriptShinya Maeda2017-05-241-12/+13
| | | | | | | | | | |
| * | | | | | | | | | put force_encoding in def reverse_lineShinya Maeda2017-05-241-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Append gurad clause. remove unless debris.emptyShinya Maeda2017-05-241-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Avoid tap. Use unless&empty.Shinya Maeda2017-05-241-7/+5
| | | | | | | | | | |
| * | | | | | | | | | Improve calc_read_sizeShinya Maeda2017-05-241-6/+2
| | | | | | | | | | |
| * | | | | | | | | | Optimize reverse_lineShinya Maeda2017-05-241-12/+13
| | | | | | | | | | |
| * | | | | | | | | | much betterShinya Maeda2017-05-241-7/+1
| | | | | | | | | | |
| * | | | | | | | | | Refer reverse_line from read_last_linesShinya Maeda2017-05-241-22/+7
| | | | | | | | | | |
| * | | | | | | | | | Use force_encoding(regex.encoding)Shinya Maeda2017-05-241-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Use force_encoding when regex contains UTF-8 charShinya Maeda2017-05-242-4/+4
| | | | | | | | | | |
| * | | | | | | | | | Use each_line. Avoid comparison of partial. Add UTF-8 spec.Shinya Maeda2017-05-242-5/+14
| | | | | | | | | | |
| * | | | | | | | | | Add changelogShinya Maeda2017-05-241-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Fix reverse_line from chunk basedShinya Maeda2017-05-242-2/+39
| | | | | | | | | | |
| * | | | | | | | | | Fix while trueShinya Maeda2017-05-241-13/+8
| | | | | | | | | | |
| * | | | | | | | | | Add reverse_lineShinya Maeda2017-05-241-1/+21
| | | | | | | | | | |
| * | | | | | | | | | ReproducedShinya Maeda2017-05-241-2/+10
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '32737-audit-long-term-cacheability-of-webpack-assets' into ↵Tim Zallmann2017-05-263-86/+155
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Audit long-term cacheability of webpack assets" Closes #32737 See merge request !11622
| * | | | | | | | | | | update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" ↵32737-audit-long-term-cacheability-of-webpack-assetsMike Greiling2017-05-252-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error
| * | | | | | | | | | | update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPluginMike Greiling2017-05-252-72/+121
| | | | | | | | | | | |
| * | | | | | | | | | | name all webpack chunks to improve long term cacheabilityMike Greiling2017-05-251-1/+13
| | | | | | | | | | | |
| * | | | | | | | | | | add NameAllModulesPlugin to cover shortcomings of NamedModulesPluginMike Greiling2017-05-253-1/+8
| | | | | | | | | | | |
| * | | | | | | | | | | upgrade to latest webpack versionMike Greiling2017-05-252-11/+16
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-2537-278/+261
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up diff rendering See merge request !11390
| * | | | | | | | | | | Address feedbackDouwe Maan2017-05-252-5/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Change code comment formattingdm-diff-cleanupDouwe Maan2017-05-231-1/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Remove @commit in compare and MR controllersDouwe Maan2017-05-233-11/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-2319-116/+111
| | | | | | | | | | | |
View Lorry Controller Status