Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Issue #595: Support Slack notifications upon issue and merge request events | Stan Hu | 2015-03-03 | 1 | -1/+2 |
* | Add brakeman rake task and improve code security | Dmitriy Zaporozhets | 2015-03-02 | 4 | -14/+39 |
* | Merge branch 'less-sql-queries' into 'master' | Dmitriy Zaporozhets | 2015-03-02 | 1 | -1/+1 |
|\ | |||||
| * | Reduce amount of sql queries on dashboard projects page | Dmitriy Zaporozhets | 2015-03-02 | 1 | -1/+1 |
* | | Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into A... | Dmitriy Zaporozhets | 2015-03-02 | 1 | -1/+2 |
|\ \ | |||||
| * | | Add Irker service | Aorimn | 2015-03-01 | 1 | -1/+2 |
| |/ | |||||
* | | Allow a user to specify a channel and username for the slack-webhook | Andrès Koetsier | 2015-02-28 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'update_update_project_milestone_path' into 'master' | Dmitriy Zaporozhets | 2015-02-27 | 1 | -1/+2 |
|\ | |||||
| * | Update project_milestone_path update route. | Marin Jankovski | 2015-02-26 | 1 | -1/+2 |
* | | Fix syntax issue | Dmitriy Zaporozhets | 2015-02-26 | 1 | -1/+1 |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into route-helper | Dmitriy Zaporozhets | 2015-02-26 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | Merge branch 'fix_gitlab_importer' into 'master' | Dmitriy Zaporozhets | 2015-02-26 | 2 | -2/+2 |
| |\ | |||||
| | * | Fix Gitorious import status page hiding of already added projects. | Douwe Maan | 2015-02-25 | 1 | -1/+1 |
| | * | Fix GitLab importer. Hide already imported projects | Valery Sizov | 2015-02-25 | 1 | -1/+1 |
* | | | Include route helper shortcut in controller | Dmitriy Zaporozhets | 2015-02-26 | 1 | -0/+1 |
* | | | More use of shortcut routes | Dmitriy Zaporozhets | 2015-02-25 | 2 | -8/+4 |
* | | | Introduce shortcuts for routing helpers | Dmitriy Zaporozhets | 2015-02-25 | 3 | -6/+6 |
|/ / | |||||
* | | Merge branch 'extend_markdown_upload' into 'master' | Dmitriy Zaporozhets | 2015-02-25 | 4 | -61/+35 |
|\ \ | |||||
| * \ | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-25 | 3 | -5/+27 |
| |\ \ | | |/ | |||||
| * | | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-24 | 26 | -69/+148 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-21 | 14 | -13/+55 |
| |\ \ \ | |||||
| * | | | | Fix URL to uploaded file. | Douwe Maan | 2015-02-20 | 1 | -1/+1 |
| * | | | | Merge branch 'extend_markdown_upload' into generic-uploads | Douwe Maan | 2015-02-20 | 4 | -57/+33 |
| |\ \ \ \ | |||||
| | * | | | | Refactor. | Douwe Maan | 2015-02-17 | 3 | -31/+40 |
| | * | | | | implement Project::UploadsController | Hannes Rosenögger | 2015-02-17 | 2 | -27/+18 |
| | * | | | | Generalize the image upload in markdown | Hannes Rosenögger | 2015-02-17 | 2 | -13/+34 |
| * | | | | | Satisfy Rubocop. | Douwe Maan | 2015-02-20 | 1 | -1/+1 |
* | | | | | | Merge branch 'bitbucket-import' | Dmitriy Zaporozhets | 2015-02-25 | 4 | -0/+102 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Re-enable rescuing from Bitbucket OAuth errors. | Douwe Maan | 2015-02-24 | 1 | -1/+1 |
| * | | | | | Load public key in initializer. | Douwe Maan | 2015-02-24 | 4 | -0/+28 |
| * | | | | | Add Bitbucket importer. | Douwe Maan | 2015-02-24 | 1 | -0/+74 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'fix-404-admin-delete' into 'master' | Dmitriy Zaporozhets | 2015-02-24 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix 404 when deleting a project | DJ Mountney | 2015-02-23 | 1 | -1/+1 |
* | | | | | | Merge branch 'contributed-projects' into 'master' | Dmitriy Zaporozhets | 2015-02-24 | 1 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Exclude forks from profile contributions list. | Douwe Maan | 2015-02-24 | 1 | -1/+3 |
* | | | | | | | Merge branch 'web_editor_branch' into 'master' | Dmitriy Zaporozhets | 2015-02-24 | 1 | -3/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Web Editor: save to new branch | Valery Sizov | 2015-02-24 | 1 | -3/+23 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Fix access to attachments uploaded with 'Choose file' button for public | Dmitriy Zaporozhets | 2015-02-24 | 1 | -0/+2 |
|/ / / / / / | |||||
* | | | | | | Allow non authenticated access to avatars | Dmitriy Zaporozhets | 2015-02-23 | 1 | -0/+9 |
| |/ / / / |/| | | | | |||||
* | | | | | Fix updating issue 500 error | Dmitriy Zaporozhets | 2015-02-22 | 1 | -1/+1 |
* | | | | | Merge branch 'master' into rails-4.1.9 | Vinnie Okada | 2015-02-21 | 16 | -13/+91 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'empty-project-redirect-vs-404' into 'master' | Dmitriy Zaporozhets | 2015-02-21 | 13 | -13/+12 |
| |\ \ \ \ | |||||
| | * | | | | Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't... | Douwe Maan | 2015-02-20 | 13 | -13/+12 |
| | |/ / / | |||||
| * | | | | Merge branch 'upload-xss-access-control' into 'master' | Marin Jankovski | 2015-02-20 | 2 | -0/+36 |
| |\ \ \ \ | |||||
| | * | | | | Satisfy Rubocop. | Douwe Maan | 2015-02-20 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| | * | | | Use controllers to serve uploads, with XSS prevention and access control. | Douwe Maan | 2015-02-20 | 2 | -0/+36 |
| | |/ / | |||||
| * | | | Add gitorious.org importer | Marcin Kulik | 2015-02-20 | 1 | -0/+43 |
| |/ / | |||||
* | | | Merge branch 'master' into rails-4.1.9 | Vinnie Okada | 2015-02-19 | 8 | -28/+62 |
|\ \ \ | |/ / | |||||
| * | | Revert "Fix broken access control and refactor avatar upload" | Dmitriy Zaporozhets | 2015-02-19 | 1 | -3/+1 |
| * | | Revert "Nitpicking." | Dmitriy Zaporozhets | 2015-02-19 | 1 | -3/+2 |