summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into full-width-tablesfull-width-tablesDouwe Maan2015-10-1935-96/+291
|\
| * 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
| | |/ / / / / /
* | | | | | | | Make tables full width.Douwe Maan2015-10-1941-678/+708
|/ / / / / / /
* | | | | | | 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
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-16113-852/+1544
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-15296-2085/+4176
| |\ \ \ \ \ \ \
| * | | | | | | | Participable doesn't need to know about MentionableDouwe Maan2015-10-145-11/+16
| * | | | | | | | Fix specsDouwe Maan2015-10-141-5/+5
| * | | | | | | | Explicitly only parse references by specified filterDouwe Maan2015-10-142-2/+8
| * | | | | | | | Have Issue#participants load all users mentioned in notes using a single queryDouwe Maan2015-10-143-24/+28
| * | | | | | | | Code cleanupDouwe Maan2015-10-133-23/+17
| * | | | | | | | Allow ReferenceExtractor to efficiently load references from multiple texts a...Douwe Maan2015-10-134-19/+36
| * | | | | | | | Efficiently load multiple references of one type.Douwe Maan2015-10-137-23/+33
| * | | | | | | | Pass project to RedactorFilterDouwe Maan2015-10-133-6/+11
View Lorry Controller Status