summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'static-middleware' into 'master'Marin Jankovski2015-02-211-5/+2
* Merge branch 'upload-xss-access-control' into 'master'Marin Jankovski2015-02-202-0/+32
* Add gitorious.org importerMarcin Kulik2015-02-201-0/+6
* Add link to share via twitter to "created project" event.Douwe Maan2015-02-131-0/+1
* 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
| * | Rubocop: Style/ElseAlignment enabledDmitriy Zaporozhets2015-02-021-5/+6
| * | Rubocop: comment indentationDmitriy Zaporozhets2015-02-021-5/+13
| * | Rubocop: Style/AlignHash enabledDmitriy Zaporozhets2015-02-021-6/+4
| * | Rubocop enabled for: Use spaces inside hash literal bracesDmitriy Zaporozhets2015-02-023-26/+26
| * | Convert hashes to ruby 1.9 styleDmitriy Zaporozhets2015-02-023-10/+10
| * | Merge pull request #8642 from fchasen/masterDmitriy Zaporozhets2015-01-291-1/+4
| |\ \
| | * | use new hash syntaxFred Chasen2015-01-231-4/+4
| | * | Split up line and use single qoutes to declare Cors settingsFred Chasen2015-01-231-1/+4
| | * | Expose Link header in CORS Api callsFred Chasen2015-01-231-1/+1
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-prote...Marco Wessel2015-01-302-7/+13
|\ \ \ \ | |/ / /
| * | | Load contribution calendar via AJAXDmitriy Zaporozhets2015-01-291-4/+3
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce...Dmitriy Zaporozhets2015-01-281-2/+2
| |\ \ \
| | * \ \ Merge branch 'ldap_defaults' into 'master'Job van der Voort2015-01-281-2/+2
| | |\ \ \
| | | * | | Make 'plain', port 389 the default for LDAPJacob Vosmaer2015-01-281-2/+2
| * | | | | Add a commit calendar to the user profileHannes Rosenögger2015-01-291-0/+4
| |/ / / /
| * | | | SEtup new routes for creating and changing repository filesDmitriy Zaporozhets2015-01-261-5/+8
| |/ / /
* | | | Allow configuring protection of the default branch upon first pushMarco Wessel2015-01-251-0/+1
|/ / /
* | | Merge branch 'haynes/gitlab-ce-project_avatar' into 'master'Dmitriy Zaporozhets2015-01-251-21/+23
|\ \ \
| * | | Fix tests, merge conflicts, some minor issues and make the project avatar fea...Hannes Rosenögger2015-01-241-22/+22
| * | | adding avatar to project settings page added avatar removal show project avat...Steven Thonus2015-01-241-0/+2
* | | | Fixes typo in config.rbYatish Mehta2015-01-241-1/+1
|/ / /
* | | Increase password reset timeout since other people trigger it when they creat...Sytse Sijbrandij2015-01-231-1/+2
|/ /
* | allow to use http in redirect urlValery Sizov2015-01-221-0/+6
* | Mix wrong comment about signupDmitriy Zaporozhets2015-01-221-1/+1
* | Merge pull request #7999 from cirosantilli/append-inplaceDmitriy Zaporozhets2015-01-211-6/+6
|\ \
| * | Append in place for strings and arraysCiro Santilli2015-01-011-6/+6
* | | Merge pull request #7762 from jubianchi/commit-closing-issuesDmitriy Zaporozhets2015-01-212-2/+2
|\ \ \
View Lorry Controller Status