summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-112-0/+2
|\
| * Make email display name configurableVyacheslav Slinko2015-03-112-0/+2
* | Remove projects page from dashboardDmitriy Zaporozhets2015-03-101-1/+0
|/
* Add starred projects page to dashboardDmitriy Zaporozhets2015-03-091-0/+6
* Merge branch 'dashboard-groups' into 'master'Dmitriy Zaporozhets2015-03-091-5/+6
|\
| * Move profile groups page to dashboardDmitriy Zaporozhets2015-03-081-5/+6
* | Merge branch 'smtp_example_update' into 'master'Marin Jankovski2015-03-091-1/+4
|\ \ | |/ |/|
| * Add link to smtp documentation.Marin Jankovski2015-03-041-1/+4
* | Add GitLab UI development kitDmitriy Zaporozhets2015-03-081-6/+3
* | Merge branch 'timeout' into 'master'Dmitriy Zaporozhets2015-03-052-16/+12
|\ \
| * | Increase timeout for Git-over-HTTP requests.Douwe Maan2015-03-042-16/+12
| |/
* | Add dashboard milestones.Douwe Maan2015-03-031-1/+5
|/
* Merge pull request #8349 from divineforest/cleanup-assets-compressDmitriy Zaporozhets2015-03-021-3/+3
|\
| * Remove useless `assets.compress` option, Rails 4 uses only `assets.js_compres...Alexander Balashov2014-11-181-3/+3
* | Add comment about note attachment redirect.Douwe Maan2015-02-281-0/+1
* | 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
|/ /