summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550Robert Speicher2015-08-202-1/+17
* Merge branch 'fix-blame-lines-grouping' into 'master'Douwe Maan2015-08-203-19/+86
|\
| * Fix blame view line groupingsStan Hu2015-08-203-19/+86
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-2027-135/+184
|\ \
| * \ Merge branch 'top-menu-improvements' into 'master'Dmitriy Zaporozhets2015-08-2027-135/+184
| |\ \ | | |/ | |/|
| | * Cleanup groups pages UI a bittop-menu-improvementsDmitriy Zaporozhets2015-08-203-11/+5
| | * Small ui improvements to snippet pageDmitriy Zaporozhets2015-08-201-8/+5
| | * Cleanup snippets index pagesDmitriy Zaporozhets2015-08-203-25/+15
| | * Fix testDmitriy Zaporozhets2015-08-201-1/+1
| | * Rebuild navigation for dashboardDmitriy Zaporozhets2015-08-2019-97/+112
| | * Refactor sidebar navigation for dashboardDmitriy Zaporozhets2015-08-2011-15/+68
| |/
* | Merge pull request #9563 from Telekom-PD/feature/control-import-optionsDmitriy Zaporozhets2015-08-2019-80/+267
|\ \ | |/ |/|
| * Import sources: changelogArtem Sidorenko2015-08-201-0/+1
| * Import sources: show only enabled sourcesArtem Sidorenko2015-08-209-77/+166
| * Import sources: settings in the admin interfaceArtem Sidorenko2015-08-209-3/+100
|/
* Merge branch '2fa-message-improvement' into 'master'Sytse Sijbrandij2015-08-191-1/+3
|\
| * Improved 2FA warning message about lost codesPatricio Cano2015-08-191-1/+3
* | Merge pull request #9551 from Telekom-PD/feature/search-for-archived-projectsDouwe Maan2015-08-1913-7/+97
|\ \ | |/ |/|
| * Spinach testsArtem Sidorenko2015-08-197-4/+81
| * Show colored icons like in the admin listingArtem Sidorenko2015-08-191-1/+2
| * Show label on archived projectsArtem Sidorenko2015-08-192-1/+5
| * Allow listing of archived projectsArtem Sidorenko2015-08-195-1/+9
|/
* Merge branch 'security' into 'master'Job van der Voort2015-08-191-0/+4
|\
| * added note about backing up recovery codeskaren Carias2015-08-181-0/+4
* | Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-1984-1434/+666
|\ \
| * \ Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-1736-70/+328
| |\ \
| * \ \ Merge branch 'pre-receive-wo-satellites' into 'remove-satellites'Dmitriy Zaporozhets2015-08-179-129/+174
| |\ \ \
| | * | | Fix typo in text when raise pre-receive exceptionDmitriy Zaporozhets2015-08-171-1/+1
| | * | | save repo empty state into variable for proper resultpre-receive-wo-satellitesDmitriy Zaporozhets2015-08-171-2/+3
| | * | | Remove unnecessary fileDmitriy Zaporozhets2015-08-141-5/+0
| | * | | merge with support of pre-receive and post-receive hooksDmitriy Zaporozhets2015-08-142-20/+12
| | * | | Refactor how repository makes commit with pre/post receive hooksDmitriy Zaporozhets2015-08-146-95/+94
| | * | | Refactor pre/post receive commit services into one classDmitriy Zaporozhets2015-08-145-154/+76
| | * | | Make sure target has not changed during pre-receive hookDmitriy Zaporozhets2015-08-141-1/+8
| | * | | Fix tests for web editorDmitriy Zaporozhets2015-08-142-3/+4
| | * | | Disable pre-receive check in test envDmitriy Zaporozhets2015-08-141-0/+7
| | * | | Capture pre-receive exceptionDmitriy Zaporozhets2015-08-132-7/+19
| | * | | Implement commit transaction with pre-receive and post-receive hooks for web ...Dmitriy Zaporozhets2015-08-139-13/+122
| |/ / /
| * | | Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-1112-40/+59
| |\ \ \
| * | | | Update CHANGELOGDmitriy Zaporozhets2015-08-111-4/+8
| * | | | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-11100-1670/+844
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-194-1/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge pull request #9567 from bigsurge/bigsurge-patch-1Stan Hu2015-08-191-0/+1
| |\ \ \ \
| | * | | | add CommitNote field expose :created_atbigsurge2015-08-191-0/+1
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Schilling2015-08-191-0/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'wip-blog-post' into 'master'Sytse Sijbrandij2015-08-181-0/+1
| | |\ \ \ \ \
| | | * | | | | Make sure blog post MR has WIP keywordwip-blog-postDmitriy Zaporozhets2015-08-181-0/+1
| * | | | | | | Time for 8.0.0.preRobert Schilling2015-08-192-1/+3
| |/ / / / / /
* | | | | | | Merge branch 'rs-help-path-traversal' into 'master'Douwe Maan2015-08-181-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use File.join instead of Rails.root.join in HelpControllerRobert Speicher2015-08-181-2/+4
|/ / / / / /
View Lorry Controller Status