summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...git-archive-refactorJacob Vosmaer2016-02-1717-35/+149
|\
| * Merge branch 'rs-issue-13469' into 'master' Douwe Maan2016-02-172-9/+14
| |\
| | * Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469Robert Speicher2016-02-152-9/+14
| * | Merge branch 'expire-fork-import-caches' into 'master' Douwe Maan2016-02-177-1/+74
| |\ \
| | * | Flush all repository caches when deleting a repoexpire-fork-import-cachesYorick Peterse2016-02-172-1/+22
| | * | Expire caches after forking/importing a repositoryYorick Peterse2016-02-176-0/+52
| * | | Merge branch 'image-diff' into 'master' Douwe Maan2016-02-173-11/+18
| |\ \ \
| | * | | Fixes requested by Rémyimage-diffJacob Vosmaer2016-02-172-4/+5
| | * | | No use to sanitize partial blob dataJacob Vosmaer2016-02-171-1/+1
| | * | | Use /raw/ requests for image diffsJacob Vosmaer2016-02-161-9/+9
| | * | | Fix SVG blob renderingJacob Vosmaer2016-02-161-1/+7
| * | | | Merge branch 'fix/13517-impossible-subsequent-issuable-edits-in-sidebar' into...Douwe Maan2016-02-172-4/+4
| |\ \ \ \
| | * | | | Fix a bug preventing from doing subsequent edits in any Issuable sidebarfix/13517-impossible-subsequent-issuable-edits-in-sidebarRémy Coutable2016-02-172-4/+4
| * | | | | Merge branch 'klowner/gitlab-ce-fix-compare-by-tag-crash' into 'master' Douwe Maan2016-02-171-0/+2
| |\ \ \ \ \
| | * | | | | Fix 500 error when comparing by tagsMark Riedesel2016-02-171-0/+2
| * | | | | | Merge branch 'bugfix/jschatz1/sidebar/02-16-16' into 'master' Douwe Maan2016-02-171-0/+16
| |\ \ \ \ \ \
| | * | | | | | Fix double scrollbar issuesJacob Schatz2016-02-171-0/+16
| |/ / / / / /
| * | | | | | Merge branch 'issue_13359' into 'master' Jacob Schatz2016-02-172-10/+21
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Wrap issue details to prevent content misalignmentissue_13359Alfredo Sumaran2016-02-162-9/+16
| | * | | | | Change "opened by" to just "by"Alfredo Sumaran2016-02-161-1/+1
| | * | | | | Prevent author name to split into multiple linesAlfredo Sumaran2016-02-151-1/+1
| | * | | | | Prevent split time into multiple lines for better readingAlfredo Sumaran2016-02-151-0/+4
| | * | | | | Move issue details after action buttonsAlfredo Sumaran2016-02-151-10/+10
| | | |_|_|/ | | |/| | |
* | | | | | Add newlineJacob Vosmaer2016-02-171-1/+1
* | | | | | Use gitlab-workhorse 0.6.5Jacob Vosmaer2016-02-172-2/+2
* | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...Jacob Vosmaer2016-02-17345-2076/+5704
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'update-allocations' into 'master' Yorick Peterse2016-02-171-1/+1
| |\ \ \ \ \
| | * | | | | Updated the allocations Gem to 1.0.4update-allocationsYorick Peterse2016-02-151-1/+1
| * | | | | | Merge branch 'spec_fix' into 'master' Douwe Maan2016-02-171-0/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | sporadic spec fixspec_fixValery Sizov2016-02-161-0/+2
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'doc-ci-variables-readme-fix' into 'master' Robert Speicher2016-02-161-1/+1
| |\ \ \ \ \
| | * | | | | fix table in doc/ci/variables/README.mdRichard Hansen2016-02-161-1/+1
| |/ / / / /
| * | | | | Merge branch 'redis_installation' into 'master' Achilleas Pipinellis2016-02-162-15/+70
| |\ \ \ \ \
| | * | | | | Fix Redis installation guideAchilleas Pipinellis2016-02-162-15/+70
| * | | | | | Merge branch 'bugfix/jschatz1/sidebar-fixes-13215' into 'master' Jacob Schatz2016-02-162-1/+26
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Make copy button in collapsed sidebar work.bugfix/jschatz1/sidebar-fixes-13215Jacob Schatz2016-02-052-1/+14
| | * | | | | Fix span margin issuesJacob Schatz2016-02-051-1/+5
| | * | | | | Add hover for gutter toggle buttonJacob Schatz2016-02-051-5/+8
| | * | | | | Change hover color of sidebar buttonsJacob Schatz2016-02-051-0/+5
| | * | | | | Fix ugly state of dropdownJacob Schatz2016-02-051-1/+1
| * | | | | | Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan2016-02-1612-98/+309
| |\ \ \ \ \ \
| | * | | | | | Use project.web_url instead deprecated repository.homepage in PushoverServiceRémy Coutable2016-02-161-1/+1
| | * | | | | | Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-1111-97/+308
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'fix/13356-issuable-index-of-total-in-sidebar' into 'master' Douwe Maan2016-02-168-95/+84
| |\ \ \ \ \ \
| | * | | | | | Display "iid of max_iid" in Issuables' sidebarRémy Coutable2016-02-163-19/+5
| | * | | | | | Fix the "x of y" displayed at the top of Issuables' sidebarfix/13356-issuable-index-of-total-in-sidebarRémy Coutable2016-02-159-96/+99
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'cleanup-repository-initialize' into 'master' Douwe Maan2016-02-163-3/+3
| |\ \ \ \ \ \
| | * | | | | | Cleaned up Repository#initializecleanup-repository-initializeYorick Peterse2016-02-163-3/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'fix/13458-eager-load-blob-data' into 'master' Douwe Maan2016-02-161-0/+2
| |\ \ \ \ \ \
| | * | | | | | Eager-load image blob data in diffsfix/13458-eager-load-blob-dataRémy Coutable2016-02-161-0/+2
| | |/ / / / /