summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix regexpread-template-from-repositoryKamil Trzcinski2016-02-201-2/+2
* Use repository and redis cacheKamil Trzcinski2016-02-194-14/+22
* Read {ISSUE,MERGE_REQUESTS}_TEMPLATE from repository headKamil Trzcinski2016-02-173-0/+17
* Merge branch 'sqlite_rm_rf' into 'master' Achilleas Pipinellis2016-02-171-1/+0
|\
| * Remove remaining sqlite method callAchilleas Pipinellis2016-02-171-1/+0
* | Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-1714-3/+247
|\ \
| * | Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-1714-3/+247
* | | Merge branch 'git-archive-refactor' into 'master' Douwe Maan2016-02-1711-71/+77
|\ \ \
| * \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...git-archive-refactorJacob Vosmaer2016-02-1717-35/+149
| |\ \ \
| * | | | 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
| |\ \ \ \
| * | | | | Fix APIJacob Vosmaer2016-02-114-6/+29
| * | | | | First version of "git archive" headersJacob Vosmaer2016-02-027-66/+49
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRémy Coutable2016-02-1771-591/+1178
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'bugfix/jschatz1/milestone-icon' into 'master' Rémy Coutable2016-02-171-1/+1
| |\ \ \ \ \ \
| | * | | | | | Correct icon for milestones.bugfix/jschatz1/milestone-iconJacob Schatz2016-02-171-1/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'fix/13464-order-line-notes-create_at-in-parallel-diff-view' int...Douwe Maan2016-02-171-1/+1
| |\ \ \ \ \ \
| | * | | | | | Sort line notes used in parallel diff by created_atRémy Coutable2016-02-171-1/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'fix/13367-redirect-to-project-page-if-no-import' into 'master' Douwe Maan2016-02-173-3/+25
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Redirect /import to project page if no importing at all and repo existsfix/13367-redirect-to-project-page-if-no-importRémy Coutable2016-02-173-3/+25
| | |/ / / /
| * | | | | 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
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | 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
| |\ \ \ \ \ \ \