summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added CHANGELOG itemsaml-external-groupsPatricio Cano2016-04-062-1/+1
* Added documentationPatricio Cano2016-04-062-0/+73
* Fix error that was causing only one group to be returned and corrected specs ...Patricio Cano2016-04-062-2/+9
* Removed extra LDAP tests and added tests for the external groups featurePatricio Cano2016-04-051-22/+46
* Changed config syntax and improved how chaanges in group memberships are han...Patricio Cano2016-04-052-29/+14
* Avoid saving again if the user attributes haven't changedPatricio Cano2016-04-041-1/+1
* Config examplesPatricio Cano2016-04-041-0/+2
* Remove unnecessary LDAP tests from SAML testsPatricio Cano2016-04-041-59/+7
* Prepare SAML for group retrievalPatricio Cano2016-04-043-2/+80
* Merge branch 'remove-2fa-status' into 'master' Jacob Schatz2016-04-041-2/+0
|\
| * Remove 2FA status on enable pageremove-2fa-statusRobert Schilling2016-03-291-2/+0
* | Merge branch 'admin-pages-layout' into 'master' Dmitriy Zaporozhets2016-04-043-35/+49
|\ \
| * | Single quotes paradiseadmin-pages-layoutDmitriy Zaporozhets2016-04-041-4/+4
| * | Improve UI for admin/groups pageDmitriy Zaporozhets2016-04-043-35/+49
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceYorick Peterse2016-04-045-9/+11
|\ \ \
| * \ \ Merge branch 'dz-admin-area-fixes' into 'master' Jacob Schatz2016-04-045-9/+11
| |\ \ \
| | * | | Fix missing paddings in admin areaDmitriy Zaporozhets2016-04-044-8/+10
| | * | | Dont use monospace font for namesDmitriy Zaporozhets2016-04-041-1/+1
| | |/ /
| * | | Merge branch 'hide_profile_activity_on_mobile' into 'master' Jacob Schatz2016-04-040-0/+0
| |\ \ \
* | \ \ \ Merge branch 'fix-forked-project-link-specs' into 'master' Yorick Peterse2016-04-041-0/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reload forked_project_link projectsYorick Peterse2016-04-041-0/+5
* | | | | Merge branch 'hide_profile_activity_on_mobile' into 'master' Jacob Schatz2016-04-042-1/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | hide user profile activity graph on mobile and enable horizontal scroll for m...hide_profile_activity_on_mobileArinde Eniola2016-04-012-1/+7
* | | | | Merge branch 'fix-award-emoji-menu' into 'master' Jacob Schatz2016-04-042-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix award emoji picker for relative_urlSandra Freihofer2016-04-012-2/+4
* | | | | Merge branch '14083-build-labels' into 'master' Jacob Schatz2016-04-041-1/+1
|\ \ \ \ \
| * | | | | Add labels to block element14083-build-labelsAnnabel Dunstone2016-04-011-1/+1
| |/ / / /
* | | | | Merge branch 'fix-ui-event' into 'master' Dmitriy Zaporozhets2016-04-041-1/+1
|\ \ \ \ \
| * | | | | Fix event rendering when create projectfix-ui-eventDmitriy Zaporozhets2016-04-041-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix_remove_fork_link' into 'master' Douwe Maan2016-04-046-11/+54
|\ \ \ \ \
| * | | | | Fix incorrect variable nameBaldinof2016-04-041-1/+1
| * | | | | Fix rubocop in unlink fork service specsBaldinof2016-04-031-2/+2
| * | | | | Move unlink fork logic to a serviceBaldinof2016-03-225-40/+52
| * | | | | Merge branch 'master' into fix_remove_fork_linkBaldinof2016-03-14158-1030/+2902
| |\ \ \ \ \
| * | | | | | Close merge requests when removing fork relationBaldinof2016-03-115-2/+33
* | | | | | | Merge branch 'fix-sidebar-exapnd' into 'master' Dmitriy Zaporozhets2016-04-041-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix transparent bg for expand sidebar buttonDmitriy Zaporozhets2016-04-041-1/+1
|/ / / / / /
* | | | | | Merge branch 'update_repository_from_ee' into 'master' Douwe Maan2016-04-043-10/+33
|\ \ \ \ \ \
| * | | | | | Migrate Repository#local_branches from gitlab-ee.update_repository_from_eeRubén Dávila2016-04-013-10/+33
* | | | | | | Merge branch 'space-before-brace-scss-lint' into 'master' Jacob Schatz2016-04-0414-20/+21
|\ \ \ \ \ \ \
| * | | | | | | Enable SpaceBeforeBrace rule for SCSS Lintconnorshea2016-03-3014-20/+21
* | | | | | | | Add 8.6.4 changelog itemRémy Coutable2016-04-041-1/+3
* | | | | | | | Merge branch 'fix-mr-for-orphaned-branches' into 'master' Rémy Coutable2016-04-044-2/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix creation of merge requests for orphaned branchesStan Hu2016-04-044-2/+35
* | | | | | | | | Merge branch '8.7-rc1' into 'master' Yorick Peterse2016-04-042-2/+148
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added 8.7 install/update guidesYorick Peterse2016-04-042-2/+148
|/ / / / / / / / /
* | | | | | | | | Merge branch 'banzai-webscale' into 'master' Douwe Maan2016-04-047-146/+215
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleaned up caching in AbstractReferenceFilterYorick Peterse2016-04-041-15/+11
| * | | | | | | | | Added CHANGELOG entry for Markdown performanceYorick Peterse2016-04-041-0/+1
| * | | | | | | | | Cache default_issues_tracker? in BanzaiYorick Peterse2016-04-041-1/+16