summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Apply responsive note styles to parallel diffsapply-same-responsive-notes-to-parallel-diffEric Eastwood2017-05-264-33/+42
* Merge branch 'dm-consistent-note-paddings' into 'master'Annabel Dunstone Gray2017-05-268-54/+75
|\
| * More consistent padding of notes, system notes, and note formDouwe Maan2017-05-268-54/+75
|/
* Merge branch 'dm-dependency-value-regex' into 'master'Grzegorz Bizon2017-05-263-6/+15
|\
| * Add specdm-dependency-value-regexDouwe Maan2017-05-261-1/+10
| * Don't allow spaces in dependency linker value regexDouwe Maan2017-05-252-5/+5
* | Merge branch '31459-fix-transient-error-caused-by-small-timeout-also-adapt-te...Grzegorz Bizon2017-05-262-22/+78
|\ \
| * | Move helpers to spec file, use const's instead of helper methodsPawel Chojnacki2017-05-253-35/+26
| * | Make the test cases more readable and fix to_s coercion problemPawel Chojnacki2017-05-231-19/+26
| * | Stop skipping tests if local dependencies are not foundPawel Chojnacki2017-05-222-9/+1
| * | Fix transient CI errors by increasing command execution timeouts from 1s to 30sPawel Chojnacki2017-05-173-7/+73
* | | Merge branch 'ci-build-pipeline-header-vue' into 'master'Phil Hughes2017-05-266-0/+352
|\ \ \
| * | | Creates CI Header component to use in pipelines and job details pagesFilipa Lacerda2017-05-266-0/+352
|/ / /
* | | Merge branch 'enable-final-newline' into 'master'Clement Ho2017-05-262-34/+34
|\ \ \
| * | | Enable final newline ruleenable-final-newlineAnnabel Dunstone Gray2017-05-262-34/+34
* | | | Merge branch 'dm-consistent-last-push-event' into 'master'Robert Speicher2017-05-2622-75/+68
|\ \ \ \
| * | | | Fix specdm-consistent-last-push-eventDouwe Maan2017-05-261-1/+1
| * | | | Make section connect with window border without extra paddingDouwe Maan2017-05-259-29/+35
| * | | | Kill copy button with 🔥Douwe Maan2017-05-251-4/+2
| * | | | Consistently display last push event widgetDouwe Maan2017-05-2520-57/+46
| | |_|/ | |/| |
* | | | Merge branch 'fix_counter_cache_invalidation' into 'master'Douwe Maan2017-05-2612-2/+46
|\ \ \ \
| * | | | Fix counters cache invalidation for Issues and Merge RequestsValery Sizov2017-05-2611-0/+44
| * | | | Set "expire_in" for counters cacheValery Sizov2017-05-261-2/+2
* | | | | Merge branch '32851-update-postgres-requirements' into 'master'Douwe Maan2017-05-261-1/+1
|\ \ \ \ \
| * | | | | Postgresql 9.2 is the minimum version from GitLab 9.3, not 9.0Nick Thomas2017-05-261-1/+1
| | |_|/ / | |/| | |
* | | | | 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 projectsissuable-form-create-label-sub-groupsPhil Hughes2017-05-253-1/+36
* | | | | | 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-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 settings31448-jira-urlsJarka Kadlecova2017-05-266-54/+156
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'diffcollection-no-restarts' into 'master'Douwe Maan2017-05-262-21/+58
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix error thrown with missing note fragment in DOM32888-fix-error-after-missing-note-hash-fragment-in-domEric Eastwood2017-05-262-2/+45
* | | | | | | | Merge branch 'fix-emoji-menu-z-index' into 'master'Annabel Dunstone Gray2017-05-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 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"Luke "Jared" Bennett2017-05-261-1/+9
|/ / / / / / / /
* | | | | | | | Merge branch '32851-postgres-min-version' into 'master'Douwe Maan2017-05-264-3/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 regionslocale-region-fixPhil Hughes2017-05-251-1/+1
* | | | | | | | Merge branch 'zj-docs-on-pipeline-schedules' into 'master'32962-diff-tab-shows-a-loading-spinnerAchilleas Pipinellis2017-05-261-19/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove trigger docs jobzj-docs-on-pipeline-schedulesZ.J. van de Weg2017-05-201-19/+0
* | | | | | | | | Merge branch '31556-ci-coverage-paralel-rspec' into 'master'Kamil Trzciński2017-05-263-24/+74
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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