summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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-172-3/+13
|\ \ \ | |/ / |/| |
| * | Redirect /import to project page if no importing at all and repo existsfix/13367-redirect-to-project-page-if-no-importRémy Coutable2016-02-172-3/+13
| |/
* | Merge branch 'expire-fork-import-caches' into 'master' Douwe Maan2016-02-174-1/+32
|\ \
| * | 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-173-0/+10
* | | 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
* | | | | 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 '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-163-11/+17
|\ \ \ \
| * | | | 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-112-10/+16
| | |_|/ | |/| |
* | | | Merge branch 'fix/13356-issuable-index-of-total-in-sidebar' into 'master' Douwe Maan2016-02-164-94/+46
|\ \ \ \
| * | | | 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-155-95/+61
| | |_|/ | |/| |
* | | | 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
| |/ / /
* | | | Merge branch 'fix/cross-reference-notes-forks' into 'master' Douwe Maan2016-02-161-5/+14
|\ \ \ \
| * | | | updated system note service and spec based on feedbackJames Lopez2016-02-161-1/+3
| * | | | woo hoo - getting there with the cross-reference issue. Should fix the proble...James Lopez2016-02-121-4/+11
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-1220-77/+86
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-1091-432/+647
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-0534-190/+531
| |\ \ \ \ \ \
| * | | | | | | WIP - fix and spec for cross reference issue with forksJames Lopez2016-02-041-2/+2
* | | | | | | | Merge branch 'rs-issue-13467' into 'master' Douwe Maan2016-02-161-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467Robert Speicher2016-02-151-2/+2
| | |_|_|_|/ / / | |/| | | | | |
View Lorry Controller Status