Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Introduce shortcuts for routing helpers | Dmitriy Zaporozhets | 2015-02-25 | 21 | -39/+57 |
* | Merge branch 'line-is-wrong-test' into 'master' | Dmitriy Zaporozhets | 2015-02-26 | 1 | -3/+3 |
|\ | |||||
| * | Make test element selection more specific. | Douwe Maan | 2015-02-25 | 1 | -3/+3 |
* | | Merge branch 'fix-another-migration' into 'master' | Dmitriy Zaporozhets | 2015-02-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | Prevent another migration from failing. | Douwe Maan | 2015-02-25 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'fix-invalid-syntax' into 'master' | Dmitriy Zaporozhets | 2015-02-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix git syntax issue | Dmitriy Zaporozhets | 2015-02-25 | 1 | -1/+1 |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-02-25 | 4 | -4/+25 |
|\ \ \ | |||||
| * \ \ | Merge pull request #8486 from kfei/docker/graceful-shutdown | Sytse Sijbrandij | 2015-02-25 | 4 | -4/+25 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Gracefully shutdown services in Docker container | kfei | 2015-02-24 | 4 | -4/+25 |
* | | | | Merge branch 'extend_markdown_upload' into 'master' | Dmitriy Zaporozhets | 2015-02-25 | 36 | -303/+319 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Move CHANGELOG entry to 7.9. | Douwe Maan | 2015-02-25 | 1 | -2/+1 |
| * | | | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-25 | 58 | -282/+296 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Fix spec. | Douwe Maan | 2015-02-24 | 1 | -1/+1 |
| * | | | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-24 | 311 | -1300/+1702 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-21 | 36 | -81/+463 |
| |\ \ \ \ | |||||
| * | | | | | Fix specs. | Douwe Maan | 2015-02-20 | 2 | -6/+8 |
| * | | | | | Fix URL to uploaded file. | Douwe Maan | 2015-02-20 | 4 | -6/+9 |
| * | | | | | Merge branch 'extend_markdown_upload' into generic-uploads | Douwe Maan | 2015-02-20 | 27 | -281/+270 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update schema. | Douwe Maan | 2015-02-18 | 1 | -0/+1 |
| | * | | | | | Change textarea upload hover icon from picture to paperclip. | Douwe Maan | 2015-02-17 | 1 | -2/+2 |
| | * | | | | | Add paperclip icon to links to uploads in notes. | Douwe Maan | 2015-02-17 | 1 | -0/+16 |
| | * | | | | | Use longer upload secret. | Douwe Maan | 2015-02-17 | 1 | -1/+1 |
| | * | | | | | Remove note attachment file selector. | Douwe Maan | 2015-02-17 | 3 | -30/+1 |
| | * | | | | | Refactor. | Douwe Maan | 2015-02-17 | 22 | -193/+163 |
| | * | | | | | Fix tests | Hannes Rosenögger | 2015-02-17 | 1 | -2/+2 |
| | * | | | | | implement Project::UploadsController | Hannes Rosenögger | 2015-02-17 | 5 | -34/+28 |
| | * | | | | | Fix tests | Hannes Rosenögger | 2015-02-17 | 1 | -4/+4 |
| | * | | | | | Generalize the image upload in markdown | Hannes Rosenögger | 2015-02-17 | 19 | -153/+241 |
| * | | | | | | Split up AttachmentUploader. | Douwe Maan | 2015-02-20 | 10 | -22/+44 |
| * | | | | | | Satisfy Rubocop. | Douwe Maan | 2015-02-20 | 4 | -5/+5 |
* | | | | | | | Merge branch 'bitbucket-import' | Dmitriy Zaporozhets | 2015-02-25 | 51 | -128/+818 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Expand Bitbucket integration docs. | Douwe Maan | 2015-02-25 | 1 | -4/+28 |
| * | | | | | | | Add ".org" back to Gitorious mentions. | Douwe Maan | 2015-02-24 | 2 | -3/+3 |
| * | | | | | | | Move CHANGELOG entry. | Douwe Maan | 2015-02-24 | 1 | -2/+2 |
| * | | | | | | | Re-enable rescuing from Bitbucket OAuth errors. | Douwe Maan | 2015-02-24 | 2 | -1/+2 |
| * | | | | | | | Bring Gitorious import page in line with others. | Douwe Maan | 2015-02-24 | 2 | -4/+9 |
| * | | | | | | | Add Bitbucket integration docs. | Douwe Maan | 2015-02-24 | 13 | -47/+163 |
| * | | | | | | | Satisfy Rubocop. | Douwe Maan | 2015-02-24 | 1 | -2/+2 |
| * | | | | | | | Link to original repo on import status pages. | Douwe Maan | 2015-02-24 | 3 | -7/+19 |
| * | | | | | | | Delete deploy key from Bitbucket after importing. | Douwe Maan | 2015-02-24 | 4 | -24/+56 |
| * | | | | | | | Fix specs. | Douwe Maan | 2015-02-24 | 5 | -2/+5 |
| * | | | | | | | Load public key in initializer. | Douwe Maan | 2015-02-24 | 9 | -15/+44 |
| * | | | | | | | Add Bitbucket importer. | Douwe Maan | 2015-02-24 | 35 | -54/+522 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #8865 from gemnasium/update-gemnasium-to-0-2-4 | Dmitriy Zaporozhets | 2015-02-25 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Bump gemnasium service gem | Philippe Lafoucrière | 2015-02-25 | 1 | -3/+3 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'refactor-header' into 'master' | Dmitriy Zaporozhets | 2015-02-25 | 25 | -239/+114 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove unnecessary theme_type from body class | Dmitriy Zaporozhets | 2015-02-24 | 13 | -13/+13 |
| * | | | | | | Get rid of black logo | Dmitriy Zaporozhets | 2015-02-24 | 3 | -7/+10 |
| * | | | | | | Refactor header logo and setup expectation on it size | Dmitriy Zaporozhets | 2015-02-24 | 7 | -22/+18 |