summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'issue-closing-pattern' into 'master'Marin Jankovski2015-02-111-1/+1
|\ | | | | | | | | | | | | | | | | | | Extend issue clossing pattern New: "Resolve", "Resolves", "Resolved", "Resolving" and "Close" Now matches those supported by [GitHub](https://help.github.com/articles/closing-issues-via-commit-messages/), with the addition of the -ing forms. See merge request !1475
| * 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. Closes #1770. ``` Started GET "/profile?private_token=[FILTERED]" for 127.0.0.1 at 2015-02-06 22:54:03 +0100 Processing by ProfilesController#show as HTML Parameters: {"private_token"=>"[FILTERED]"} ``` See merge request !1483
| * Filter private_token and password_confirmation params from logs.Douwe Maan2015-02-061-1/+1
| | | | | | | | Closes #1770.
* | Merge branch 'markdown-preview-via-post' into 'master'Dmitriy Zaporozhets2015-02-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Don't have Markdown preview fail for long comments/wiki pages. See https://github.com/gitlabhq/gitlabhq/issues/8611. See merge request !1479
| * | Don't have Markdown preview fail for long content by using POST rather than GET.Douwe Maan2015-02-061-1/+1
| | | | | | | | | | | | See https://github.com/gitlabhq/gitlabhq/issues/8611.
* | | 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")
| * 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
| | | | | | | | | | | | | | | Conflicts: config/routes.rb
| * | 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
| |\ \ | | | | | | | | Expose Link header in CORS Api calls
| | * | 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 ↵Marco Wessel2015-01-302-7/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | configure-protection Conflicts: CHANGELOG db/schema.rb
| * | | Load contribution calendar via AJAXDmitriy Zaporozhets2015-01-291-4/+3
| | | |
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Dmitriy Zaporozhets2015-01-281-2/+2
| |\ \ \ | | | | | | | | | | | | | | | haynes/gitlab-ce-commit_calendar
| | * \ \ Merge branch 'ldap_defaults' into 'master'Job van der Voort2015-01-281-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Saner LDAP defaults I have the impression that most people use LDAP servers listening on port 389, without encryption. If we make that the default we give people a smoother ride setting up GitLab. See merge request !1446
| | | * | | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | Project avatar See merge request !1433
| * | | Fix tests, merge conflicts, some minor issues and make the project avatar ↵Hannes Rosenögger2015-01-241-22/+22
| | | | | | | | | | | | | | | | feature mergable
| * | | adding avatar to project settings page added avatar removal show project ↵Steven Thonus2015-01-241-0/+2
| | | | | | | | | | | | | | | | avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix
* | | | Fixes typo in config.rbYatish Mehta2015-01-241-1/+1
|/ / /
* | | Increase password reset timeout since other people trigger it when they ↵Sytse Sijbrandij2015-01-231-1/+2
|/ / | | | | | | create an account for you.
* | 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 arrays [failure unrelated]
| * | 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
|\ \ \ | | | | | | | | Allow commit messages to close several issues at once
| * | | Allow commit messages to close several issues at once (thanks @123Haynesjubianchi2015-01-202-2/+2
| | | | | | | | | | | | | | | | for his work and help)
* | | | Github Importer: AJAX update statusValery Sizov2015-01-201-0/+1
|/ / /
* | | Merge pull request #8040 from drag00n/updatedhintDrew Blessing2015-01-181-1/+1
|\ \ \ | | | | | | | | Use full path from root of project.
| * | | Use full path from root of project.drag00n2015-01-181-1/+1
| | | | | | | | | | | | | | | | Remove markdown syntax from config file
* | | | Application admin scaffoldValery Sizov2015-01-172-1/+3
| | | |
View Lorry Controller Status