Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'configurable-attachment-size' into 'master' | Douwe Maan | 2015-04-03 | 2 | -3/+12 |
|\ | |||||
| * | Support configurable attachment size via Application Settings | Stan Hu | 2015-04-02 | 2 | -3/+12 |
* | | Merge branch 'import-current-user' into 'master' | Dmitriy Zaporozhets | 2015-04-02 | 1 | -0/+4 |
|\ \ | |||||
| * | | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user i... | Douwe Maan | 2015-03-31 | 1 | -0/+4 |
* | | | Merge branch 'repository-archive-worker' into 'master' | Dmitriy Zaporozhets | 2015-04-02 | 1 | -5/+6 |
|\ \ \ | |||||
| * | | | Archive repositories in background worker. | Douwe Maan | 2015-03-31 | 1 | -5/+6 |
| |/ / | |||||
* | | | Merge branch 'username-period' into 'master' | Dmitriy Zaporozhets | 2015-04-02 | 3 | -32/+38 |
|\ \ \ | |||||
| * | | | Don't allow username to end in period. | Douwe Maan | 2015-03-27 | 2 | -3/+5 |
| * | | | Use more specific regexes. | Douwe Maan | 2015-03-27 | 1 | -30/+34 |
| * | | | Move User.cleanup_username to Namespace.cleanup_path. | Douwe Maan | 2015-03-27 | 1 | -1/+1 |
* | | | | ability to skip some items in backupbackup_skip_option | Valery Sizov | 2015-04-02 | 2 | -15/+60 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Marin Jankovski | 2015-03-31 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'no-chmod-r' into 'master' | Dmitriy Zaporozhets | 2015-04-01 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Don't use chmod_R for backup tars | Vinnie Okada | 2015-03-28 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2015-03-31 | 2 | -16/+16 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'group-information-leak' into 'master' | Dmitriy Zaporozhets | 2015-04-01 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Don't leak private group existence by redirecting from namespace controller t... | Douwe Maan | 2015-03-24 | 1 | -1/+1 |
| * | | | | Merge pull request #9023 from dantudor/patch-1 | Dmitriy Zaporozhets | 2015-03-31 | 1 | -3/+3 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Added the missing comma | Dan Tudor | 2015-03-31 | 1 | -1/+1 |
| | * | | | Allow ability to delete branches with '/` in name | Dan Tudor | 2015-03-25 | 1 | -3/+3 |
* | | | | | Merge branch 'email-full-url' | Marin Jankovski | 2015-03-31 | 1 | -37/+53 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Use relative URL for Markdown references, except in mails.email-full-url | Douwe Maan | 2015-03-27 | 1 | -37/+53 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'events-paginate' into 'master' | Douwe Maan | 2015-03-30 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Updated api method GET /projects/:id/events to use paginate instead of a self... | Stephan van Leeuwen | 2015-03-24 | 1 | -5/+2 |
* | | | | | Include brakeman in rake test | Dmitriy Zaporozhets | 2015-03-29 | 1 | -0/+1 |
* | | | | | properly paginate project events in API | Nihad Abbasov | 2015-03-29 | 1 | -4/+1 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'backup-chdir' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 1 | -7/+8 |
|\ \ \ \ | |||||
| * | | | | Change directory when removing old backups | Vinnie Okada | 2015-03-24 | 1 | -7/+8 |
* | | | | | Merge branch 'master' into 'master' | Dmitriy Zaporozhets | 2015-03-26 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Change ordering so that confirm is removed from attrs before attempting to Us... | RICKETTM@uk.ibm.com | 2015-03-24 | 1 | -2/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #9021 from nicklegr/faster_auto_merge | Dmitriy Zaporozhets | 2015-03-25 | 1 | -5/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Reset parking branch to HEAD everytime | nicklegr | 2015-03-25 | 1 | -5/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #8007 from mr-vinn/markdown-tags | Dmitriy Zaporozhets | 2015-03-25 | 1 | -9/+25 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into markdown-tags | Vinnie Okada | 2015-03-24 | 8 | -60/+124 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch 'master' into markdown-tags | Vinnie Okada | 2015-03-22 | 6 | -24/+38 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix SanitizationFilter bugs | Vinnie Okada | 2015-03-22 | 1 | -1/+2 |
| * | | | | | | Merge branch 'master' into markdown-tags | Vinnie Okada | 2015-03-21 | 8 | -33/+37 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Don't allow style attributes in inline HTML | Vinnie Okada | 2015-03-21 | 1 | -1/+1 |
| * | | | | | | | Change HTML sanitization | Vinnie Okada | 2015-03-19 | 1 | -13/+23 |
| * | | | | | | | Merge branch 'master' into markdown-tags | Vinnie Okada | 2015-03-17 | 111 | -786/+3129 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow HTML tags in user Markdown input | Vinnie Okada | 2014-10-10 | 1 | -0/+5 |
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-03-25 | 5 | -6/+6 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'more-rubocop-styles' into 'master' | Dmitriy Zaporozhets | 2015-03-25 | 5 | -6/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Style/RedundantReturn enabledmore-rubocop-styles | Dmitriy Zaporozhets | 2015-03-24 | 3 | -4/+4 |
| | * | | | | | | | | Enable more rubocop style checks | Dmitriy Zaporozhets | 2015-03-24 | 2 | -3/+3 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
* | | | | | | | | | Merge pull request #8988 from atomaka/atomaka/bugfix/gitlab-shell-task | Robert Schilling | 2015-03-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix newline spacing after authorized_keys rebuild | Andrew Tomaka | 2015-03-20 | 1 | -0/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'api-internal-errors' into 'master' | Dmitriy Zaporozhets | 2015-03-25 | 5 | -68/+105 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Respond with full GitAccess error if user has project read access.api-internal-errors | Douwe Maan | 2015-03-24 | 1 | -1/+1 |
| * | | | | | | | Refactor GitAccess to use instance variables. | Douwe Maan | 2015-03-24 | 5 | -67/+104 |
| | |_|_|_|_|/ | |/| | | | | |