summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'update_smtp_example' into 'master'Dmitriy Zaporozhets2015-02-061-2/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add openssl_verify_mode option to the smtp configuration example.Marin Jankovski2015-02-051-2/+3
* | | | | | | Merge branch 'refactor_import' into 'master'Valery Sizov2015-02-064-31/+45
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | GitHub importer refactoringValery Sizov2015-02-054-31/+45
|/ / / / / /
* | | | | | Merge branch 'submit-comment-on-command-enter' into 'master'Dmitriy Zaporozhets2015-02-062-2/+2
|\ \ \ \ \ \
| * | | | | | Submit comment on command-enter.Douwe Maan2015-02-052-2/+2
| |/ / / / /
* | | | | | Merge branch 'remove-group-milestone-participants-duplicates' into 'master'Dmitriy Zaporozhets2015-02-062-4/+4
|\ \ \ \ \ \
| * | | | | | Remove duplicates from group milestone participants list.Douwe Maan2015-02-052-4/+4
| |/ / / / /
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqValery Sizov2015-02-051-2/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #8318 from bbodenmiller/patch-9Jeroen van Baarsen2015-02-051-2/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | add editor command to update database.yml; cleanupBen Bodenmiller2014-11-231-2/+5
* | | | | | Merge branch 'gitlab_importer' into 'master'Dmitriy Zaporozhets2015-02-0632-125/+615
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | gitlab.com importer: refactorigValery Sizov2015-02-0514-140/+85
| * | | | | gitlab.com importer: fix specs after refactoringValery Sizov2015-02-051-2/+2
| * | | | | code foldingValery Sizov2015-02-051-1/+1
| * | | | | update changelogValery Sizov2015-02-051-0/+2
| * | | | | Gitlab.com integration: code foldingValery Sizov2015-02-052-3/+3
| * | | | | GitLab.com integration: refactoringValery Sizov2015-02-0516-32/+52
| * | | | | GitLab.com integration: small view fixValery Sizov2015-02-052-2/+2
| * | | | | GitLab.com integration: refactoringValery Sizov2015-02-055-6/+6
| * | | | | Gitlab integration: added testsValery Sizov2015-02-052-1/+26
| * | | | | GitLab integration. ImporterValery Sizov2015-02-0523-16/+514
|/ / / / /
* | | | | Merge branch 'dont-download-image-attachments'Dmitriy Zaporozhets2015-02-052-2/+3
|\ \ \ \ \
| * | | | | Update changelog.Douwe Maan2015-02-051-1/+1
| * | | | | Show image attachments in browser instead of downloading them.Douwe Maan2015-02-041-1/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'redirect-sign_up' into 'master'Dmitriy Zaporozhets2015-02-053-29/+12
|\ \ \ \ \
| * | | | | Redirect signup page to signin page.Douwe Maan2015-02-053-29/+12
| |/ / / /
* | | | | Merge branch 'reserverd-project-names' into 'master'Dmitriy Zaporozhets2015-02-052-2/+1
|\ \ \ \ \
| * | | | | CHANGELOG updated with project na,es blacklistDmitriy Zaporozhets2015-02-041-1/+1
| * | | | | Disable project path blacklistDmitriy Zaporozhets2015-02-041-1/+0
|/ / / / /
* | | | | Merge branch 'font-variable' into 'master'Dmitriy Zaporozhets2015-02-041-1/+1
|\ \ \ \ \
| * | | | | Use the font variables instead of hardcoding fonts in notes.DJ Mountney2014-12-101-1/+1
* | | | | | Merge branch 'fix/groupsearch' into 'master'Dmitriy Zaporozhets2015-02-041-1/+1
|\ \ \ \ \ \
| * | | | | | Fix group search to check path as well as name.Tim Bishop2015-01-301-1/+1
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-02-042-12/+12
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'foo-barred' into 'master'Dmitriy Zaporozhets2015-02-042-12/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Fixes the search test that fails whenever faker uses a name with Bar in it. L...DJ Mountney2014-12-082-12/+12
| | | |/ / / / / | | |/| | | | |
* | | | | | | | 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 pull request #8395 from sbeh/masterDmitriy Zaporozhets2015-02-041-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Socket [::]:123 on Linux listens on IPv4 and IPv6sbeh2014-11-261-2/+2
* | | | | | | | | | Merge pull request #8726 from jvanbaarsen/sidebar-colors-commentDmitriy Zaporozhets2015-02-041-2/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Also show colors in the sidebar of commentJeroen van Baarsen2015-02-031-2/+4
* | | | | | | | | | Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpointDmitriy Zaporozhets2015-02-045-6/+111
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added a way to retrieve MR filesJeroen van Baarsen2015-02-045-6/+111
* | | | | | | | | | | Fix testsDmitriy Zaporozhets2015-02-041-1/+1
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-02-0431-121/+143
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'consolidate_ssh_docs' into 'master'Marin Jankovski2015-02-0431-121/+143
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Consolidate the SSH topics into a single file, since the twoEwan Edwards2015-02-043-49/+71
| | * | | | | | | | | | Fix a number of discovered typos, capitalization of developer andEwan Edwards2015-02-0328-72/+72