summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Redirect old note attachment path to new uploads path.Douwe Maan2015-02-271-0/+4
* Merge branch 'extend_markdown_upload' into 'master'Dmitriy Zaporozhets2015-02-251-8/+8
|\
| * Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-243-139/+189
| |\
| * \ Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-212-0/+11
| |\ \
| * | | Fix specs.Douwe Maan2015-02-201-4/+6
| * | | Fix URL to uploaded file.Douwe Maan2015-02-201-3/+3
| * | | Merge branch 'extend_markdown_upload' into generic-uploadsDouwe Maan2015-02-201-6/+6
| |\ \ \
| | * | | Refactor.Douwe Maan2015-02-171-2/+5
| | * | | implement Project::UploadsControllerHannes Rosenögger2015-02-171-2/+3
| | * | | Generalize the image upload in markdownHannes Rosenögger2015-02-171-2/+3
| * | | | Satisfy Rubocop.Douwe Maan2015-02-202-3/+3
* | | | | Re-enable rescuing from Bitbucket OAuth errors.Douwe Maan2015-02-241-0/+1
* | | | | Fix specs.Douwe Maan2015-02-241-1/+1
* | | | | Load public key in initializer.Douwe Maan2015-02-241-0/+2
* | | | | Add Bitbucket importer.Douwe Maan2015-02-242-8/+15
| |_|_|/ |/| | |
* | | | Merge pull request #8782 from jvanbaarsen/no-test-class-cachingDmitriy Zaporozhets2015-02-231-1/+1
|\ \ \ \
| * | | | Don't cache classes in testsJeroen van Baarsen2015-02-121-1/+1
* | | | | Using gitlab url to build links for gitlab issue tracker and add a spec. Fix ...Marin Jankovski2015-02-231-10/+17
* | | | | Fix markdown image uploader after rails updateDmitriy Zaporozhets2015-02-231-3/+3
* | | | | Fix style issue for rubocopDmitriy Zaporozhets2015-02-231-8/+12
* | | | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-212-0/+35
|\ \ \ \ \
| * | | | | Change check to only swap static middleware when it's enabled.Douwe Maan2015-02-211-5/+2
| | |_|_|/ | |/| | |
| * | | | Merge branch 'upload-xss-access-control' into 'master'Marin Jankovski2015-02-202-0/+32
| |\ \ \ \
| | * | | | Explain `Gitlab::Middleware::Static`.Douwe Maan2015-02-201-0/+5
| | * | | | Satisfy Rubocop.Douwe Maan2015-02-202-5/+7
| | | |/ / | | |/| |
| | * | | Use controllers to serve uploads, with XSS prevention and access control.Douwe Maan2015-02-201-0/+12
| | * | | Use modified ActionDispatch::Static to let uploads go through to routes.Douwe Maan2015-02-201-0/+13
| | | |/ | | |/|
| * | | Add gitorious.org importerMarcin Kulik2015-02-201-0/+6
| |/ /
* | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-191-0/+1
|\ \ \ | |/ /
| * | Add link to share via twitter to "created project" event.Douwe Maan2015-02-131-0/+1
* | | Upgrade to Rails 4.1.9Vinnie Okada2015-02-141-125/+167
|/ /
* | Add admin services templates.Marin Jankovski2015-02-111-4/+6
|/
* Merge branch 'issue-closing-pattern' into 'master'Marin Jankovski2015-02-111-1/+1
|\
| * Extend issue closing pattern.Douwe Maan2015-02-081-1/+1
* | Remove settings from gitlab.yml.example which we already have in UIDmitriy Zaporozhets2015-02-101-17/+0
|/
* Add gitlab to oauth providersDmitriy Zaporozhets2015-02-071-0/+3
* Merge branch 'filter-private-token-param' into 'master'Dmitriy Zaporozhets2015-02-071-1/+1
|\
| * Filter private_token and password_confirmation params from logs.Douwe Maan2015-02-061-1/+1
* | Merge branch 'markdown-preview-via-post' into 'master'Dmitriy Zaporozhets2015-02-061-1/+1
|\ \
| * | Don't have Markdown preview fail for long content by using POST rather than GET.Douwe Maan2015-02-061-1/+1
* | | Add openssl_verify_mode option to the smtp configuration example.Marin Jankovski2015-02-051-2/+3
| |/ |/|
* | GitLab.com integration: refactoringValery Sizov2015-02-051-4/+4
* | GitLab integration. ImporterValery Sizov2015-02-052-6/+17
|/
* Merge pull request #8449 from choppsv1/ipv6_addr_fixDmitriy Zaporozhets2015-02-041-1/+5
|\
| * Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git")Christian E. Hopps2014-12-151-1/+5
* | Merge branch 'master' into mwessel/gitlab-ce-configure-protectionDmitriy Zaporozhets2015-02-038-66/+80
|\ \
| * | code foldingValery Sizov2015-02-031-2/+2
| * | Commit page: async load branches infoValery Sizov2015-02-031-2/+6
| * | Rubocop: indentation fixes Yay!!!Dmitriy Zaporozhets2015-02-021-12/+12
| * | Rubocop: no trailing newlinesDmitriy Zaporozhets2015-02-022-2/+2