summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-253-4/+13
|\
| * Merge branch 'ldap-special-chars-fix' into 'master' Douwe Maan2015-12-242-4/+4
| |\
| | * No mb_chars needed anymoreldap-special-chars-fixDouwe Maan2015-12-241-2/+2
| | * Fix identity and user retrieval when special characters are usedPatricio Cano2015-12-222-3/+3
| * | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' Douwe Maan2015-12-241-0/+9
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-12-2152-1986/+426
| | |\
| | * \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-2026-262/+1230
| | |\ \
| | * \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-044-7/+14
| | |\ \ \
| | * | | | Fix GitlabV::isibilityLevel::level_name methodTomasz Maczukin2015-11-041-1/+1
| | * | | | Move level_name resolving to Gitlan::VisibilityLevelTomasz Maczukin2015-11-031-0/+9
* | | | | | Merge branch 'feature/import_kerberos_identities_ad' of https://gitlab.com/ce...Dmitriy Zaporozhets2015-12-255-9/+73
|\ \ \ \ \ \
| * | | | | | Import Kerberos identities automatically from Active DirectoryAlex Lossent2015-12-102-0/+41
| * | | | | | Canonicalization of Kerberos identities to always include realmAlex Lossent2015-12-103-9/+32
* | | | | | | Merge branch 'master' into ce_upstreamValery Sizov2015-12-232-0/+21
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-211-0/+17
| |\ \ \ \ \ \
| | * | | | | | add CAS authentication supporttduehr2015-12-141-0/+17
| * | | | | | | Merge branch 'git-version' into 'master' Douwe Maan2015-12-211-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Show git version on admin pageTrey Davis2015-12-151-0/+4
| | |/ / / / / /
| * | | | | | | Backport JIRA serviceDrew Blessing2015-12-181-1/+11
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Rename pages namespace or project path when changedKamil Trzcinski2015-12-183-29/+43
* | | | | | | Merge remote-tracking branch 'ce/master'Robert Speicher2015-12-1748-2075/+33
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-169-12/+17
| |\ \ \ \ \ \
| | * | | | | | Fixed Rubocop offensesGabriel Mazetto2015-12-1511-14/+19
| | |/ / / / /
| * | | | | | Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-1539-2047/+12
| |/ / / / /
* | | | | | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-12-153-1/+85
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-142-2/+4
| |\ \ \ \ \
| | * | | | | Fix specsKamil Trzcinski2015-12-111-1/+1
| | * | | | | Add runners tokenKamil Trzcinski2015-12-111-1/+1
| | * | | | | Migrate CI::Project to ProjectKamil Trzcinski2015-12-112-2/+4
| * | | | | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-142-0/+82
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Migrate CI WebHooks and Emails to new tablesKamil Trzcinski2015-12-101-0/+18
| | * | | | | Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-101-0/+64
* | | | | | | Fix ReferenceExtractor specRobert Speicher2015-12-141-1/+1
* | | | | | | fix specsValery Sizov2015-12-141-3/+3
* | | | | | | Merge branch 'master' into ee_masterValery Sizov2015-12-1439-221/+504
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan2015-12-111-0/+137
| |\ \ \ \ \
| | * | | | | Mix url helpers in into `RepositoryPush`Grzegorz Bizon2015-12-111-9/+10
| | * | | | | Check if commits are available in `RepositoryPush`Grzegorz Bizon2015-12-081-3/+3
| | * | | | | Duplicate options in `RepositoryPush`Grzegorz Bizon2015-12-081-4/+4
| | * | | | | Add `RepositoryPush` specsGrzegorz Bizon2015-12-081-5/+5
| | * | | | | Fix url helpers in RepositoryPushGrzegorz Bizon2015-12-081-3/+4
| | * | | | | Remove obsolete variables in `repository_push_email`Grzegorz Bizon2015-12-081-3/+14
| | * | | | | Improve Messagee::RepositoryPushGrzegorz Bizon2015-12-081-61/+65
| | * | | | | Refactor RepositoryPush, move to Message namespaceGrzegorz Bizon2015-12-082-116/+120
| | * | | | | Extract repository_push_email to separate classGrzegorz Bizon2015-12-081-0/+116
| * | | | | | AuthHash should not parameterize email userCorey Hinshaw2015-12-101-1/+1
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-102-1/+18
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-0837-220/+366
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-082-65/+5
| | |\ \ \ \ \ \
| | * | | | | | | Fix RedactorFilterDouwe Maan2015-12-081-1/+1
View Lorry Controller Status