summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Correctly set comparison first commit when range includes a merge commitcompare-first-commitDouwe Maan2015-11-172-3/+3
* Merge branch 'stanhu/gitlab-ce-bump-gitlab-git-and-other-gems'Douwe Maan2015-11-093-19/+19
|\
| * Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3.Stan Hu2015-11-093-19/+17
* | Update monthly release issue templateRobert Speicher2015-11-091-35/+51
* | Update CHANGELOGRobert Speicher2015-11-091-4/+6
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-0943-63/+1727
|\ \
| * \ Merge branch 'fix-incoming-email-default' into 'master' Robert Speicher2015-11-092-2/+3
| |\ \ | | |/ | |/|
| | * Fix incoming email config defaultsfix-incoming-email-defaultDouwe Maan2015-11-092-2/+3
| * | Merge branch 'accept_mr_btn_ci_status' into 'master' Dmitriy Zaporozhets2015-11-092-1/+17
| |\ \
| | * | Merge button has color from CI statusBaldinof2015-11-062-1/+17
| * | | Only load rblineprof when actually neededYorick Peterse2015-11-092-1/+2
| * | | Merge branch 'sherlock' into 'master' Yorick Peterse2015-11-0940-60/+1706
| |\ \ \
| | * | | Added changelog entry for SherlockYorick Peterse2015-11-091-0/+1
| | * | | Truncate transaction paths to 70 charactersYorick Peterse2015-11-091-1/+3
| | * | | Track the amount of times views are renderedYorick Peterse2015-11-094-14/+103
| | * | | Added navigation link to SherlockYorick Peterse2015-11-091-0/+5
| | * | | Fixed Hash key style in Sherlock::Query specYorick Peterse2015-11-091-1/+1
| | * | | Updated profiling guides for SherlockYorick Peterse2015-11-091-37/+8
| | * | | Added specs and source documentation for SherlockYorick Peterse2015-11-0916-12/+758
| | * | | Added Sherlock, a custom profiling tool for GitLabYorick Peterse2015-11-0929-23/+855
| |/ / /
* | | | Merge pull request #9814 from Totof6942/patch-ui-graphs-headerDmitriy Zaporozhets2015-11-095-5/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo.Christophe Poulette2015-11-081-1/+1
| * | | Fix typoChristophe Poulette2015-11-081-1/+1
| * | | Apply new design for project graphs pageChristophe Poulette2015-11-085-6/+18
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-0914-15/+86
|\ \ \ \
| * \ \ \ Merge branch 'fix-commits-manual-merge' into 'master' Douwe Maan2015-11-093-4/+24
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add spec for manual merge of merge requestStan Hu2015-11-061-0/+19
| | * | | Fix bug where manually merged branches in a MR would end up with an empty diffStan Hu2015-11-052-4/+5
| * | | | Merge branch 'shared_runners' into 'master' Kamil TrzciƄski2015-11-0912-11/+62
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix testsshared_runnersKamil Trzcinski2015-11-083-3/+31
| | * | | Enable shared runners for all new projectsKamil Trzcinski2015-11-059-8/+31
* | | | | Merge pull request #9756 from Soullivaneuh/patch-1Jeroen van Baarsen2015-11-091-2/+3
|\ \ \ \ \
| * | | | | Add GitLabCI code coverage regex sample for PHPUnitSullivan SENECHAL2015-11-091-2/+3
|/ / / / /
* | | | | Merge pull request #9813 from axilleas/fix_piwik_templateJeroen van Baarsen2015-11-081-8/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update piwik templateAchilleas Pipinellis2015-11-081-8/+10
|/ / / /
* | | | Merge branch 'markdown-form-hint' into 'master' Dmitriy Zaporozhets2015-11-074-12/+8
|\ \ \ \
| * | | | Render same markdown hint for issue, merge request, wiki and comment formsmarkdown-form-hintDmitriy Zaporozhets2015-11-074-12/+8
|/ / / /
* | | | Merge pull request #9782 from gitlabhq/jvanbaarsen-patch-1Robert Schilling2015-11-071-2/+2
|\ \ \ \
| * | | | Fixed markdown issue in PROCESS.mdJeroen van Baarsen2015-11-071-2/+2
* | | | | Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-providerJeroen van Baarsen2015-11-071-19/+27
|\ \ \ \ \
| * | | | | Hide tab-bar in login-box when only one tabs is shown.Christian Speich2015-11-071-19/+27
|/ / / / /
* | | | | Merge branch 'small-ui-improvements' into 'master' Dmitriy Zaporozhets2015-11-076-5/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Small UI improvements to merge request pagesmall-ui-improvementsDmitriy Zaporozhets2015-11-066-5/+12
* | | | | Merge pull request #9807 from SkySymbol/fix_line_orderRobert Schilling2015-11-061-1/+1
|\ \ \ \ \
| * | | | | It makes more sense like thisVincent Lequertier2015-11-041-1/+1
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-0651-241/+280
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix_doc_ci_links' into 'master' Achilleas Pipinellis2015-11-051-0/+2
| |\ \ \ \ \ \
| | * | | | | | Add CI permissions and api links to README [ci skip]Achilleas Pipinellis2015-11-051-0/+2
| |/ / / / / /
| * | | | | | Remove duplicate documentation linksAchilleas Pipinellis2015-11-051-16/+11
| * | | | | | Merge branch 'reversible_migration' into 'master' Dmitriy Zaporozhets2015-11-053-3/+13
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |