summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change "Irc Uri" -> "IRC URI"Stan Hu2015-07-072-2/+2
* Merge branch 'report-delete-branch-error-codes' into 'master'Dmitriy Zaporozhets2015-07-063-2/+29
|\
| * Return 40x error codes if branch could not be deleted in UIStan Hu2015-07-063-2/+29
|/
* Merge branch 'graphs-branch-switching' into 'master'Stan Hu2015-07-065-16/+28
|\
| * Add ref switching support for graphsDaniel Gerhardt2015-07-065-16/+28
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-064-18/+0
|\ \
| * \ Merge branch 'disable-sticky-diffs' into 'master'Dmitriy Zaporozhets2015-07-064-18/+0
| |\ \
| | * | Remove sticky-diff functionalitydisable-sticky-diffsDmitriy Zaporozhets2015-07-062-8/+0
| | * | Revert "Diff headers made sticky"Dmitriy Zaporozhets2015-07-062-10/+0
* | | | Merge pull request #9430 from gitlabhq/fix-rake-test-ciDmitriy Zaporozhets2015-07-061-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Use teaspoon instead of jasmine:ciDmitriy Zaporozhets2015-07-031-1/+1
| |/ /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-0627-153/+259
|\ \ \
| * \ \ Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-0621-32/+144
| |\ \ \
| | * | | Audit log for user authenticationValery Sizov2015-07-0621-33/+144
| * | | | Merge branch 'add-irker-options' into 'master'Dmitriy Zaporozhets2015-07-066-121/+85
| |\ \ \ \
| | * | | | Add Irker service configuration optionsStan Hu2015-07-056-121/+85
| * | | | | Merge branch 'doc-list' into 'master'Robert Speicher2015-07-051-0/+30
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Improve documentation of lists in MarkdownRaniere Silva2015-07-031-0/+30
* | | | | | Merge branch 'k-fix-link' into 'master' Job van der Voort2015-07-061-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fixed link to gitlab-basicskaren Carias2015-07-051-1/+1
|/ / / / /
* | | | | Add 7.12.2 CHANGELOG entriesJacob Vosmaer2015-07-031-0/+3
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJacob Vosmaer2015-07-036-2/+113
|\ \ \ \ \
| * \ \ \ \ Merge branch 'api-user-blocking' into 'master'Stan Hu2015-07-034-0/+110
| |\ \ \ \ \
| | * | | | | Allow user to be blocked and unblocked via the APISteve Norman2015-07-034-0/+110
| |/ / / / /
| * | | | | Merge branch 'contributing-gitlab-cloud-outdated' into 'master'Sytse Sijbrandij2015-07-031-1/+1
| |\ \ \ \ \
| | * | | | | [ci skip] Changed the reference from gitlab cloud to gitlab.com because it wa...Markus Mauksch2015-07-031-1/+1
| |/ / / / /
| * | | | | Merge branch 'fix-homepage-redirection' into 'master'Robert Speicher2015-07-032-1/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix redirection to home page URL for unauthorized usersDaniel Gerhardt2015-07-032-1/+2
| |/ / / /
* | | | | Merge branch 'create-final-rc' into 'master' Job van der Voort2015-07-021-5/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Change RC/final package release timingJacob Vosmaer2015-06-191-5/+10
* | | | | 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