Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Redirect old note attachment path to new uploads path. | Douwe Maan | 2015-02-27 | 1 | -0/+4 |
* | Merge branch 'extend_markdown_upload' into 'master' | Dmitriy Zaporozhets | 2015-02-25 | 1 | -8/+8 |
|\ | |||||
| * | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-24 | 3 | -139/+189 |
| |\ | |||||
| * \ | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-21 | 2 | -0/+11 |
| |\ \ | |||||
| * | | | Fix specs. | Douwe Maan | 2015-02-20 | 1 | -4/+6 |
| * | | | Fix URL to uploaded file. | Douwe Maan | 2015-02-20 | 1 | -3/+3 |
| * | | | Merge branch 'extend_markdown_upload' into generic-uploads | Douwe Maan | 2015-02-20 | 1 | -6/+6 |
| |\ \ \ | |||||
| | * | | | Refactor. | Douwe Maan | 2015-02-17 | 1 | -2/+5 |
| | * | | | implement Project::UploadsController | Hannes Rosenögger | 2015-02-17 | 1 | -2/+3 |
| | * | | | Generalize the image upload in markdown | Hannes Rosenögger | 2015-02-17 | 1 | -2/+3 |
| * | | | | Satisfy Rubocop. | Douwe Maan | 2015-02-20 | 2 | -3/+3 |
* | | | | | Re-enable rescuing from Bitbucket OAuth errors. | Douwe Maan | 2015-02-24 | 1 | -0/+1 |
* | | | | | Fix specs. | Douwe Maan | 2015-02-24 | 1 | -1/+1 |
* | | | | | Load public key in initializer. | Douwe Maan | 2015-02-24 | 1 | -0/+2 |
* | | | | | Add Bitbucket importer. | Douwe Maan | 2015-02-24 | 2 | -8/+15 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #8782 from jvanbaarsen/no-test-class-caching | Dmitriy Zaporozhets | 2015-02-23 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Don't cache classes in tests | Jeroen van Baarsen | 2015-02-12 | 1 | -1/+1 |
* | | | | | Using gitlab url to build links for gitlab issue tracker and add a spec. Fix ... | Marin Jankovski | 2015-02-23 | 1 | -10/+17 |
* | | | | | Fix markdown image uploader after rails update | Dmitriy Zaporozhets | 2015-02-23 | 1 | -3/+3 |
* | | | | | Fix style issue for rubocop | Dmitriy Zaporozhets | 2015-02-23 | 1 | -8/+12 |
* | | | | | Merge branch 'master' into rails-4.1.9 | Vinnie Okada | 2015-02-21 | 2 | -0/+35 |
|\ \ \ \ \ | |||||
| * | | | | | Change check to only swap static middleware when it's enabled. | Douwe Maan | 2015-02-21 | 1 | -5/+2 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'upload-xss-access-control' into 'master' | Marin Jankovski | 2015-02-20 | 2 | -0/+32 |
| |\ \ \ \ | |||||
| | * | | | | Explain `Gitlab::Middleware::Static`. | Douwe Maan | 2015-02-20 | 1 | -0/+5 |
| | * | | | | Satisfy Rubocop. | Douwe Maan | 2015-02-20 | 2 | -5/+7 |
| | | |/ / | | |/| | | |||||
| | * | | | Use controllers to serve uploads, with XSS prevention and access control. | Douwe Maan | 2015-02-20 | 1 | -0/+12 |
| | * | | | Use modified ActionDispatch::Static to let uploads go through to routes. | Douwe Maan | 2015-02-20 | 1 | -0/+13 |
| | | |/ | | |/| | |||||
| * | | | Add gitorious.org importer | Marcin Kulik | 2015-02-20 | 1 | -0/+6 |
| |/ / | |||||
* | | | Merge branch 'master' into rails-4.1.9 | Vinnie Okada | 2015-02-19 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Add link to share via twitter to "created project" event. | Douwe Maan | 2015-02-13 | 1 | -0/+1 |
* | | | Upgrade to Rails 4.1.9 | Vinnie Okada | 2015-02-14 | 1 | -125/+167 |
|/ / | |||||
* | | Add admin services templates. | Marin Jankovski | 2015-02-11 | 1 | -4/+6 |
|/ | |||||
* | Merge branch 'issue-closing-pattern' into 'master' | Marin Jankovski | 2015-02-11 | 1 | -1/+1 |
|\ | |||||
| * | Extend issue closing pattern. | Douwe Maan | 2015-02-08 | 1 | -1/+1 |
* | | Remove settings from gitlab.yml.example which we already have in UI | Dmitriy Zaporozhets | 2015-02-10 | 1 | -17/+0 |
|/ | |||||
* | Add gitlab to oauth providers | Dmitriy Zaporozhets | 2015-02-07 | 1 | -0/+3 |
* | Merge branch 'filter-private-token-param' into 'master' | Dmitriy Zaporozhets | 2015-02-07 | 1 | -1/+1 |
|\ | |||||
| * | Filter private_token and password_confirmation params from logs. | Douwe Maan | 2015-02-06 | 1 | -1/+1 |
* | | Merge branch 'markdown-preview-via-post' into 'master' | Dmitriy Zaporozhets | 2015-02-06 | 1 | -1/+1 |
|\ \ | |||||
| * | | Don't have Markdown preview fail for long content by using POST rather than GET. | Douwe Maan | 2015-02-06 | 1 | -1/+1 |
* | | | Add openssl_verify_mode option to the smtp configuration example. | Marin Jankovski | 2015-02-05 | 1 | -2/+3 |
| |/ |/| | |||||
* | | GitLab.com integration: refactoring | Valery Sizov | 2015-02-05 | 1 | -4/+4 |
* | | GitLab integration. Importer | Valery Sizov | 2015-02-05 | 2 | -6/+17 |
|/ | |||||
* | Merge pull request #8449 from choppsv1/ipv6_addr_fix | Dmitriy Zaporozhets | 2015-02-04 | 1 | -1/+5 |
|\ | |||||
| * | Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git") | Christian E. Hopps | 2014-12-15 | 1 | -1/+5 |
* | | Merge branch 'master' into mwessel/gitlab-ce-configure-protection | Dmitriy Zaporozhets | 2015-02-03 | 8 | -66/+80 |
|\ \ | |||||
| * | | code folding | Valery Sizov | 2015-02-03 | 1 | -2/+2 |
| * | | Commit page: async load branches info | Valery Sizov | 2015-02-03 | 1 | -2/+6 |
| * | | Rubocop: indentation fixes Yay!!! | Dmitriy Zaporozhets | 2015-02-02 | 1 | -12/+12 |
| * | | Rubocop: no trailing newlines | Dmitriy Zaporozhets | 2015-02-02 | 2 | -2/+2 |