Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor sorting in project | Dmitriy Zaporozhets | 2015-02-05 | 18 | -108/+195 |
* | Fix method overlap for issue sorting | Dmitriy Zaporozhets | 2015-02-05 | 5 | -3/+5 |
* | Explicitly define ordering in models using default_scope | Dmitriy Zaporozhets | 2015-02-05 | 22 | -16/+67 |
* | Add timestamps to identity | Dmitriy Zaporozhets | 2015-02-05 | 2 | -6/+13 |
* | Merge branch 'dont-download-image-attachments' | Dmitriy Zaporozhets | 2015-02-05 | 2 | -2/+3 |
|\ | |||||
| * | Update changelog. | Douwe Maan | 2015-02-05 | 1 | -1/+1 |
| * | Show image attachments in browser instead of downloading them. | Douwe Maan | 2015-02-04 | 1 | -1/+2 |
* | | Merge branch 'redirect-sign_up' into 'master' | Dmitriy Zaporozhets | 2015-02-05 | 3 | -29/+12 |
|\ \ | |||||
| * | | Redirect signup page to signin page. | Douwe Maan | 2015-02-05 | 3 | -29/+12 |
| |/ | |||||
* | | Merge branch 'reserverd-project-names' into 'master' | Dmitriy Zaporozhets | 2015-02-05 | 2 | -2/+1 |
|\ \ | |||||
| * | | CHANGELOG updated with project na,es blacklist | Dmitriy Zaporozhets | 2015-02-04 | 1 | -1/+1 |
| * | | Disable project path blacklist | Dmitriy Zaporozhets | 2015-02-04 | 1 | -1/+0 |
|/ / | |||||
* | | Merge branch 'font-variable' into 'master' | Dmitriy Zaporozhets | 2015-02-04 | 1 | -1/+1 |
|\ \ | |||||
| * | | Use the font variables instead of hardcoding fonts in notes. | DJ Mountney | 2014-12-10 | 1 | -1/+1 |
* | | | Merge branch 'fix/groupsearch' into 'master' | Dmitriy Zaporozhets | 2015-02-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix group search to check path as well as name. | Tim Bishop | 2015-01-30 | 1 | -1/+1 |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-02-04 | 2 | -12/+12 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'foo-barred' into 'master' | Dmitriy Zaporozhets | 2015-02-04 | 2 | -12/+12 |
| |\ \ \ \ | |||||
| | * | | | | Fixes the search test that fails whenever faker uses a name with Bar in it. L... | DJ Mountney | 2014-12-08 | 2 | -12/+12 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge pull request #8449 from choppsv1/ipv6_addr_fix | Dmitriy Zaporozhets | 2015-02-04 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git") | Christian E. Hopps | 2014-12-15 | 1 | -1/+5 |
* | | | | | | Merge pull request #8395 from sbeh/master | Dmitriy Zaporozhets | 2015-02-04 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Socket [::]:123 on Linux listens on IPv4 and IPv6 | sbeh | 2014-11-26 | 1 | -2/+2 |
* | | | | | | | Merge pull request #8726 from jvanbaarsen/sidebar-colors-comment | Dmitriy Zaporozhets | 2015-02-04 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Also show colors in the sidebar of comment | Jeroen van Baarsen | 2015-02-03 | 1 | -2/+4 |
* | | | | | | | Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpoint | Dmitriy Zaporozhets | 2015-02-04 | 5 | -6/+111 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Added a way to retrieve MR files | Jeroen van Baarsen | 2015-02-04 | 5 | -6/+111 |
* | | | | | | | | Fix tests | Dmitriy Zaporozhets | 2015-02-04 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2015-02-04 | 31 | -121/+143 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'consolidate_ssh_docs' into 'master' | Marin Jankovski | 2015-02-04 | 31 | -121/+143 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | Consolidate the SSH topics into a single file, since the two | Ewan Edwards | 2015-02-04 | 3 | -49/+71 |
| | * | | | | | | | Fix a number of discovered typos, capitalization of developer and | Ewan Edwards | 2015-02-03 | 28 | -72/+72 |
* | | | | | | | | | Merge pull request #8661 from limansky/master | Jacob Vosmaer | 2015-02-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fixes #8478. Update timfel-krb5-auth to 0.8.3. | Mike Limansky | 2015-02-03 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'doc_cookbook_uses_omnibus' into 'master' | Marin Jankovski | 2015-02-04 | 5 | -17/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Drop comments on cookbook installing from source now that it uses Omnibus. | Achilleas Pipinellis | 2015-01-28 | 5 | -17/+17 |
* | | | | | | | | | | Merge branch 'add_more_maintenance_tasks' into 'master' | Dmitriy Zaporozhets | 2015-02-04 | 1 | -22/+52 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add assets precompile and redis clear cache to maintenance tasks. | Achilleas Pipinellis | 2015-01-28 | 1 | -22/+52 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'blame_encoding_error_fix' into 'master' | Dmitriy Zaporozhets | 2015-02-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix "500: Encoding error" on blame view | Timo Lilja | 2015-01-17 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'mwessel/gitlab-ce-configure-protection' into 'master' | Dmitriy Zaporozhets | 2015-02-04 | 12 | -15/+74 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Improve protected branches selectbox options | Dmitriy Zaporozhets | 2015-02-03 | 1 | -5/+6 |
| * | | | | | | | | | | | Merge branch 'master' into mwessel/gitlab-ce-configure-protection | Dmitriy Zaporozhets | 2015-02-03 | 156 | -498/+1895 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add test for default branch protection configuration | Marco Wessel | 2015-01-31 | 1 | -0/+18 |
| * | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-prote... | Marco Wessel | 2015-01-30 | 140 | -629/+1479 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Spelling error | Marco Wessel | 2015-01-25 | 1 | -1/+1 |
| * | | | | | | | | | | | | | actually fix indentation | Marco Wessel | 2015-01-25 | 1 | -1/+1 |
| * | | | | | | | | | | | | | indentation | Marco Wessel | 2015-01-25 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Fix indentation | Marco Wessel | 2015-01-25 | 2 | -4/+4 |
| * | | | | | | | | | | | | | Allow configuring protection of the default branch upon first push | Marco Wessel | 2015-01-25 | 12 | -14/+52 |