summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-209-19/+38
* Merge branch 'notify-footer' into 'master' Robert Speicher2015-10-191-0/+4
|\
| * Restore notification footer text.notify-footerDouwe Maan2015-10-181-0/+4
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-10-191-1/+0
|\ \
| * \ Merge branch 'fix-code-leading-indent' into 'master' Dmitriy Zaporozhets2015-10-191-1/+0
| |\ \
| | * | Remove some padding from code blocks Mike Kelly2015-10-141-2/+1
* | | | Merge branch 'add-files-optionto-changelog'Dmitriy Zaporozhets2015-10-192-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Add changelog itemadd-files-optionto-changelogDouwe Maan2015-10-192-0/+3
* | | | Merge branch 'user-page-new-ui' into 'master' Dmitriy Zaporozhets2015-10-197-39/+112
|\ \ \ \
| * | | | Partly implement new UI for user pageuser-page-new-uiDmitriy Zaporozhets2015-10-167-39/+112
* | | | | Merge branch 'milestone-issue-sorting-performance' into 'master' Yorick Peterse2015-10-195-5/+79
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Improve performance of sorting milestone issuesYorick Peterse2015-10-195-5/+79
|/ / / /
* | | | Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into 'm...Douwe Maan2015-10-1911-27/+146
|\ \ \ \
| * | | | Move changelog item to 8.2Douwe Maan2015-10-191-2/+1
| * | | | Fix spechanloong/gitlab-ce-remove-forks-from-projects-settingsDouwe Maan2015-10-181-1/+1
| * | | | Tweak wording.Douwe Maan2015-10-184-19/+21
| * | | | Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw2015-10-17251-1520/+3574
| |\ \ \ \
| * | | | | Made suggested content changes based on MR ReviewHan Loong Liauw2015-10-148-39/+63
| * | | | | Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw2015-10-1343-330/+348
| |\ \ \ \ \
| * | | | | | Adds ability to remove the forked relationshipHan Loong Liauw2015-10-1310-7/+101
* | | | | | | Merge branch 'close-issues-by-mr' into 'master' Robert Speicher2015-10-192-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix bug preventing mentioned issued from being closed when MR is merged using...close-issues-by-mrDouwe Maan2015-10-182-0/+11
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'cristianbica/gitlab-ce-user-project-view-files' into 'master' Dmitriy Zaporozhets2015-10-1922-98/+131
|\ \ \ \ \ \ \
| * | | | | | | Fix readme speccristianbica/gitlab-ce-user-project-view-filesDouwe Maan2015-10-181-2/+2
| * | | | | | | Only load tree when project has repository to prevent 404Douwe Maan2015-10-181-1/+5
| * | | | | | | Make spec names more clearDouwe Maan2015-10-171-3/+6
| * | | | | | | Tweak help text.Douwe Maan2015-10-171-2/+2
| * | | | | | | Put grey block around blob ref switcher and breadcrumb.Douwe Maan2015-10-172-17/+17
| * | | | | | | Remove border at bottom of readme.Douwe Maan2015-10-171-0/+4
| * | | | | | | Tweak styling of project home files list.Douwe Maan2015-10-172-14/+5
| * | | | | | | Use same style for project readme, tree readme and regular blob.Douwe Maan2015-10-173-19/+10
| * | | | | | | Split up projects/tree/_tree partial.Douwe Maan2015-10-173-38/+37
| * | | | | | | Set vars used by tree view in project show action.Douwe Maan2015-10-171-4/+8
| * | | | | | | Remove redundant helper method.Douwe Maan2015-10-172-12/+5
| * | | | | | | Move last push info at top of project page.Douwe Maan2015-10-173-3/+3
| * | | | | | | Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-filesDouwe Maan2015-10-17602-5378/+8831
| |\ \ \ \ \ \ \
| * | | | | | | | Allow users to select the Files view as default project viewCristian Bica2015-10-019-52/+96
* | | | | | | | | Merge branch 'hash-block-return' into 'master' Robert Speicher2015-10-192-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix bug where a push would only create cross references from the first commit.hash-block-returnDouwe Maan2015-10-182-2/+2
* | | | | | | | | | Merge pull request #9744 from jamierocks/patch-1Stan Hu2015-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix spelling of DescriptionJamie Mansfield2015-10-181-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'cross-reference-mr-on-issues' into 'master' Douwe Maan2015-10-1813-7/+88
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into cross-reference-mr-on-issueszj/gitlab-ce-cross-reference-mr-on-issuesZeger-Jan van de Weg2015-10-169-19/+127
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Only accept open issues and merge requestsZeger-Jan van de Weg2015-10-1610-19/+62
| * | | | | | | | | Show merge requests which close current issueZeger-Jan van de Weg2015-10-169-2/+40
* | | | | | | | | | Merge branch 'outdated-discussion-padding' into 'master' Dmitriy Zaporozhets2015-10-172-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix padding of outdated discussion item.outdated-discussion-paddingDouwe Maan2015-10-162-1/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fix-issue-3067' into 'master' Dmitriy Zaporozhets2015-10-172-6/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix nonatomic database update potentially causing project star counts to go n...Stan Hu2015-10-172-6/+10
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs-redactor-filter' into 'master' Douwe Maan2015-10-1744-476/+810
|\ \ \ \ \ \ \ \ \