summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactor sorting in projectDmitriy Zaporozhets2015-02-0518-108/+195
* Fix method overlap for issue sortingDmitriy Zaporozhets2015-02-055-3/+5
* Explicitly define ordering in models using default_scopeDmitriy Zaporozhets2015-02-0522-16/+67
* Add timestamps to identityDmitriy Zaporozhets2015-02-052-6/+13
* 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
* | | | | | | | | Merge pull request #8661 from limansky/masterJacob Vosmaer2015-02-041-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fixes #8478. Update timfel-krb5-auth to 0.8.3.Mike Limansky2015-02-031-1/+1
* | | | | | | | | Merge branch 'doc_cookbook_uses_omnibus' into 'master'Marin Jankovski2015-02-045-17/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Drop comments on cookbook installing from source now that it uses Omnibus.Achilleas Pipinellis2015-01-285-17/+17
* | | | | | | | | | Merge branch 'add_more_maintenance_tasks' into 'master'Dmitriy Zaporozhets2015-02-041-22/+52
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add assets precompile and redis clear cache to maintenance tasks.Achilleas Pipinellis2015-01-281-22/+52
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'blame_encoding_error_fix' into 'master'Dmitriy Zaporozhets2015-02-041-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix "500: Encoding error" on blame viewTimo Lilja2015-01-171-1/+1
* | | | | | | | | | | Merge branch 'mwessel/gitlab-ce-configure-protection' into 'master'Dmitriy Zaporozhets2015-02-0412-15/+74
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve protected branches selectbox optionsDmitriy Zaporozhets2015-02-031-5/+6
| * | | | | | | | | | | Merge branch 'master' into mwessel/gitlab-ce-configure-protectionDmitriy Zaporozhets2015-02-03156-498/+1895
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add test for default branch protection configurationMarco Wessel2015-01-311-0/+18
| * | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-prote...Marco Wessel2015-01-30140-629/+1479
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Spelling errorMarco Wessel2015-01-251-1/+1
| * | | | | | | | | | | | | actually fix indentationMarco Wessel2015-01-251-1/+1
| * | | | | | | | | | | | | indentationMarco Wessel2015-01-251-1/+1
| * | | | | | | | | | | | | Fix indentationMarco Wessel2015-01-252-4/+4
| * | | | | | | | | | | | | Allow configuring protection of the default branch upon first pushMarco Wessel2015-01-2512-14/+52