summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-032-3/+12
|\
| * Support configurable attachment size via Application SettingsStan Hu2015-04-022-3/+12
* | Merge branch 'import-current-user' into 'master'Dmitriy Zaporozhets2015-04-021-0/+4
|\ \
| * | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user i...Douwe Maan2015-03-311-0/+4
* | | Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets2015-04-021-5/+6
|\ \ \
| * | | Archive repositories in background worker.Douwe Maan2015-03-311-5/+6
| |/ /
* | | Merge branch 'username-period' into 'master'Dmitriy Zaporozhets2015-04-023-32/+38
|\ \ \
| * | | Don't allow username to end in period.Douwe Maan2015-03-272-3/+5
| * | | Use more specific regexes.Douwe Maan2015-03-271-30/+34
| * | | Move User.cleanup_username to Namespace.cleanup_path.Douwe Maan2015-03-271-1/+1
* | | | ability to skip some items in backupbackup_skip_optionValery Sizov2015-04-022-15/+60
| |_|/ |/| |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2015-03-311-1/+1
|\ \ \
| * \ \ Merge branch 'no-chmod-r' into 'master'Dmitriy Zaporozhets2015-04-011-1/+1
| |\ \ \
| | * | | Don't use chmod_R for backup tarsVinnie Okada2015-03-281-1/+1
| | |/ /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-312-16/+16
|\ \ \ \
| * \ \ \ Merge branch 'group-information-leak' into 'master'Dmitriy Zaporozhets2015-04-011-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Don't leak private group existence by redirecting from namespace controller t...Douwe Maan2015-03-241-1/+1
| * | | | Merge pull request #9023 from dantudor/patch-1Dmitriy Zaporozhets2015-03-311-3/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Added the missing commaDan Tudor2015-03-311-1/+1
| | * | | Allow ability to delete branches with '/` in nameDan Tudor2015-03-251-3/+3
* | | | | Merge branch 'email-full-url'Marin Jankovski2015-03-311-37/+53
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use relative URL for Markdown references, except in mails.email-full-urlDouwe Maan2015-03-271-37/+53
| | |_|/ | |/| |
* | | | Merge branch 'events-paginate' into 'master'Douwe Maan2015-03-301-1/+1
|\ \ \ \
| * | | | Updated api method GET /projects/:id/events to use paginate instead of a self...Stephan van Leeuwen2015-03-241-5/+2
* | | | | Include brakeman in rake testDmitriy Zaporozhets2015-03-291-0/+1
* | | | | properly paginate project events in APINihad Abbasov2015-03-291-4/+1
| |/ / / |/| | |
* | | | Merge branch 'backup-chdir' into 'master'Dmitriy Zaporozhets2015-03-261-7/+8
|\ \ \ \
| * | | | Change directory when removing old backupsVinnie Okada2015-03-241-7/+8
* | | | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-03-261-2/+2
|\ \ \ \ \
| * | | | | Change ordering so that confirm is removed from attrs before attempting to Us...RICKETTM@uk.ibm.com2015-03-241-2/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #9021 from nicklegr/faster_auto_mergeDmitriy Zaporozhets2015-03-251-5/+1
|\ \ \ \ \
| * | | | | Reset parking branch to HEAD everytimenicklegr2015-03-251-5/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #8007 from mr-vinn/markdown-tagsDmitriy Zaporozhets2015-03-251-9/+25
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into markdown-tagsVinnie Okada2015-03-248-60/+124
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-226-24/+38
| |\ \ \ \ \
| * | | | | | Fix SanitizationFilter bugsVinnie Okada2015-03-221-1/+2
| * | | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-218-33/+37
| |\ \ \ \ \ \
| * | | | | | | Don't allow style attributes in inline HTMLVinnie Okada2015-03-211-1/+1
| * | | | | | | Change HTML sanitizationVinnie Okada2015-03-191-13/+23
| * | | | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-17111-786/+3129
| |\ \ \ \ \ \ \
| * | | | | | | | Allow HTML tags in user Markdown inputVinnie Okada2014-10-101-0/+5
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-255-6/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Merge branch 'more-rubocop-styles' into 'master'Dmitriy Zaporozhets2015-03-255-6/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Style/RedundantReturn enabledmore-rubocop-stylesDmitriy Zaporozhets2015-03-243-4/+4
| | * | | | | | | | Enable more rubocop style checksDmitriy Zaporozhets2015-03-242-3/+3
| | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | Merge pull request #8988 from atomaka/atomaka/bugfix/gitlab-shell-taskRobert Schilling2015-03-251-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix newline spacing after authorized_keys rebuildAndrew Tomaka2015-03-201-0/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'api-internal-errors' into 'master'Dmitriy Zaporozhets2015-03-255-68/+105
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Respond with full GitAccess error if user has project read access.api-internal-errorsDouwe Maan2015-03-241-1/+1
| * | | | | | | Refactor GitAccess to use instance variables.Douwe Maan2015-03-245-67/+104
| | |_|_|_|_|/ | |/| | | | |