summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove sticky-diff functionalitydisable-sticky-diffsDmitriy Zaporozhets2015-07-062-8/+0
* Revert "Diff headers made sticky"Dmitriy Zaporozhets2015-07-062-10/+0
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-0216-31/+115
|\
| * Merge branch 'add-unlock-access' into 'master'Dmitriy Zaporozhets2015-07-026-0/+35
| |\
| | * Add support for unlocking users in admin settingsStan Hu2015-07-026-0/+35
| * | Merge branch 'feature/recent_order' into 'master'Hannes Rosenögger2015-07-022-1/+2
| |\ \
| | * | add CHANGELOGcatatsuy2015-07-021-0/+1
| | * | 'created_at DESC' is performed twicecatatsuy2015-07-021-1/+1
| |/ /
| * | Merge branch 'anonymous-applications' into 'master'Dmitriy Zaporozhets2015-07-025-4/+25
| |\ \
| | * | Correctly show anonymous authorized applications under Profile > Applications.Douwe Maan2015-07-025-4/+25
| * | | Merge branch 'saml-troubleshooting' into 'master'Dmitriy Zaporozhets2015-07-021-0/+5
| |\ \ \
| | * | | Add Troubleshooting section to SAML doc.saml-troubleshootingDouwe Maan2015-07-011-0/+5
| * | | | Merge branch 'disable-deploy-edit-link' into 'master'Dmitriy Zaporozhets2015-07-022-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove link leading to a 404 error in Deploy Keys pageStan Hu2015-07-012-2/+2
| | | |/ | | |/|
| * | | Merge branch 'rs-gem-security' into 'master'Dmitriy Zaporozhets2015-07-022-22/+41
| |\ \ \
| | * | | Gem updates for security issuesRobert Speicher2015-06-302-22/+41
| * | | | Merge branch 'fix-changelog' into 'master'Stan Hu2015-07-021-2/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix changelog for !767 and !794Daniel Gerhardt2015-07-011-2/+1
| * | | | Merge branch 'gfm-commit' into 'master'Robert Speicher2015-07-011-0/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | commit hashes are monospacedNicolás Reynolds2015-07-011-0/+4
* | | | | Merge branch 'creategroup' into 'master' Job van der Voort2015-07-025-4/+29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fixed linkkaren Carias2015-07-011-2/+2
| * | | | new document about creating a projectkaren Carias2015-07-015-4/+29
|/ / / /
* | | | Mention faster merge operation inside one projectDmitriy Zaporozhets2015-07-011-0/+1
* | | | Merge branch 'improve-spinach-test-for-mr-submit' into 'master'Stan Hu2015-07-011-0/+1
|\ \ \ \
| * | | | Add an expect call to prevent random Spinach failure:Stan Hu2015-06-231-0/+1
* | | | | Merge branch 'refactor-can-be-merge' into 'master'Dmitriy Zaporozhets2015-07-013-7/+24
|\ \ \ \ \
| * | | | | Refactor can_be_merged logic for merge requestDmitriy Zaporozhets2015-07-013-7/+24
|/ / / / /
* | | | | Merge branch 'use-rugged-for-merge' into 'master'Dmitriy Zaporozhets2015-07-013-6/+56
|\ \ \ \ \
| * | | | | Merge branches inside one repository using rugged instead of satellitesDmitriy Zaporozhets2015-07-013-6/+56
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-multiple-ref-prefix' into 'master'Stan Hu2015-07-013-4/+16
|\ \ \ \ \
| * | | | | Extract the longest-matching ref from a commit path when multiple matches occurStan Hu2015-07-013-4/+16
|/ / / / /
* | | | | Update CHANGELOG for 7.12.1Jacob Vosmaer2015-07-011-0/+9
* | | | | Merge branch 'forking_on_gitlab_ci' into 'master'Valery Sizov2015-07-011-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix of GitLab CI forkingValery Sizov2015-07-011-0/+1
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-012-3/+2
|\ \ \ \
| * \ \ \ Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-07-012-3/+2
| |\ \ \ \
| | * | | | Fix commits feed buttonDmitriy Zaporozhets2015-07-011-1/+1
| | * | | | Open big avatar when click on user imageDmitriy Zaporozhets2015-06-301-1/+1
| | * | | | Make commits atom feed button smallerDmitriy Zaporozhets2015-06-301-1/+0
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-012-2/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'fix-zero-sha-lookup' into 'master'Dmitriy Zaporozhets2015-07-012-2/+12
| |\ \ \ \ \
| | * | | | | Repository#blob_at should return nil for 00000000... shafix-zero-sha-lookupDmitriy Zaporozhets2015-07-012-2/+12
* | | | | | | Merge branch 'group_settings_nav' into 'master'Douwe Maan2015-07-0110-36/+37
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix consistency issue in sidebars of Project and Group Settings.Nicolas2015-06-2410-36/+37
* | | | | | | Mention performance improvements after adding cache to some fragmentsDmitriy Zaporozhets2015-07-011-0/+1
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-017-7/+44
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'reporter-manage-issues' into 'master'Dmitriy Zaporozhets2015-07-016-6/+43
| |\ \ \ \ \ \ \
| | * | | | | | | Reporter role can manage issue tracker nowreporter-manage-issuesDmitriy Zaporozhets2015-06-306-6/+43
| * | | | | | | | Merge branch 'k-devise' into 'master'Job van der Voort2015-07-011-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |