summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix sticky diff headerDmitriy Zaporozhets2015-02-252-1/+3
* No need to block db:rollback for safe migrationDmitriy Zaporozhets2015-02-251-1/+0
* Merge branch 'line-is-wrong-test' into 'master'Dmitriy Zaporozhets2015-02-261-3/+3
|\
| * Make test element selection more specific.Douwe Maan2015-02-251-3/+3
* | Merge branch 'fix-another-migration' into 'master'Dmitriy Zaporozhets2015-02-261-1/+1
|\ \
| * | Prevent another migration from failing.Douwe Maan2015-02-251-1/+1
| |/
* | Merge branch 'fix-invalid-syntax' into 'master'Dmitriy Zaporozhets2015-02-261-1/+1
|\ \
| * | Fix git syntax issueDmitriy Zaporozhets2015-02-251-1/+1
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-254-4/+25
|\ \ \
| * \ \ Merge pull request #8486 from kfei/docker/graceful-shutdownSytse Sijbrandij2015-02-254-4/+25
| |\ \ \ | | |/ / | |/| |
| | * | Gracefully shutdown services in Docker containerkfei2015-02-244-4/+25
* | | | Merge branch 'extend_markdown_upload' into 'master'Dmitriy Zaporozhets2015-02-2536-303/+319
|\ \ \ \ | |/ / / |/| | |
| * | | Move CHANGELOG entry to 7.9.Douwe Maan2015-02-251-2/+1
| * | | Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-2558-282/+296
| |\ \ \ | | | |/ | | |/|
| * | | Fix spec.Douwe Maan2015-02-241-1/+1
| * | | Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-24311-1300/+1702
| |\ \ \
| * \ \ \ Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-2136-81/+463
| |\ \ \ \
| * | | | | Fix specs.Douwe Maan2015-02-202-6/+8
| * | | | | Fix URL to uploaded file.Douwe Maan2015-02-204-6/+9
| * | | | | Merge branch 'extend_markdown_upload' into generic-uploadsDouwe Maan2015-02-2027-281/+270
| |\ \ \ \ \
| | * | | | | Update schema.Douwe Maan2015-02-181-0/+1
| | * | | | | Change textarea upload hover icon from picture to paperclip.Douwe Maan2015-02-171-2/+2
| | * | | | | Add paperclip icon to links to uploads in notes.Douwe Maan2015-02-171-0/+16
| | * | | | | Use longer upload secret.Douwe Maan2015-02-171-1/+1
| | * | | | | Remove note attachment file selector.Douwe Maan2015-02-173-30/+1
| | * | | | | Refactor.Douwe Maan2015-02-1722-193/+163
| | * | | | | Fix testsHannes Rosenögger2015-02-171-2/+2
| | * | | | | implement Project::UploadsControllerHannes Rosenögger2015-02-175-34/+28
| | * | | | | Fix testsHannes Rosenögger2015-02-171-4/+4
| | * | | | | Generalize the image upload in markdownHannes Rosenögger2015-02-1719-153/+241
| * | | | | | Split up AttachmentUploader.Douwe Maan2015-02-2010-22/+44
| * | | | | | Satisfy Rubocop.Douwe Maan2015-02-204-5/+5
* | | | | | | Merge branch 'bitbucket-import'Dmitriy Zaporozhets2015-02-2551-128/+818
|\ \ \ \ \ \ \
| * | | | | | | Expand Bitbucket integration docs.Douwe Maan2015-02-251-4/+28
| * | | | | | | Add ".org" back to Gitorious mentions.Douwe Maan2015-02-242-3/+3
| * | | | | | | Move CHANGELOG entry.Douwe Maan2015-02-241-2/+2
| * | | | | | | Re-enable rescuing from Bitbucket OAuth errors.Douwe Maan2015-02-242-1/+2
| * | | | | | | Bring Gitorious import page in line with others.Douwe Maan2015-02-242-4/+9
| * | | | | | | Add Bitbucket integration docs.Douwe Maan2015-02-2413-47/+163
| * | | | | | | Satisfy Rubocop.Douwe Maan2015-02-241-2/+2
| * | | | | | | Link to original repo on import status pages.Douwe Maan2015-02-243-7/+19
| * | | | | | | Delete deploy key from Bitbucket after importing.Douwe Maan2015-02-244-24/+56
| * | | | | | | Fix specs.Douwe Maan2015-02-245-2/+5
| * | | | | | | Load public key in initializer.Douwe Maan2015-02-249-15/+44
| * | | | | | | Add Bitbucket importer.Douwe Maan2015-02-2435-54/+522
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #8865 from gemnasium/update-gemnasium-to-0-2-4Dmitriy Zaporozhets2015-02-251-3/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Bump gemnasium service gemPhilippe Lafoucrière2015-02-251-3/+3
|/ / / / / /
* | | | | | Merge branch 'refactor-header' into 'master'Dmitriy Zaporozhets2015-02-2525-239/+114
|\ \ \ \ \ \
| * | | | | | Remove unnecessary theme_type from body classDmitriy Zaporozhets2015-02-2413-13/+13
| * | | | | | Get rid of black logoDmitriy Zaporozhets2015-02-243-7/+10