summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Close Zen mode by ESC, foward/backwardRobert Schilling2014-09-115-3/+60
| * | | | | | Implement zen mode for issues/MRs/notesRobert Schilling2014-09-115-6/+157
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #7738 from dblessing/serialize_migration_fixDmitriy Zaporozhets2014-09-122-2/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix serialize migration. Fixes #7734Drew Blessing2014-09-112-2/+8
* | | | | | Merge pull request #7733 from bbodenmiller/patch-12Robert Schilling2014-09-111-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | update grant command to match how mysql showsBen Bodenmiller2014-09-111-1/+1
* | | | | | Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-09-116-141/+190
|\ \ \ \ \ \
| * | | | | | Update Gemfile.lockJan-Willem van der Meer2014-09-111-1/+1
| * | | | | | Merge remote-tracking branch 'origin/master' into feature-oauth-refactoringJan-Willem van der Meer2014-09-11167-909/+2250
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Remove duplicated create methodJan-Willem van der Meer2014-09-081-10/+0
| * | | | | | Test authenticate method for Gitlab::LDAP::UserJan-Willem van der Meer2014-09-082-11/+32
| * | | | | | Ensure Gitlab::LDAP::authentication is testedJan-Willem van der Meer2014-09-081-0/+17
| * | | | | | Refactor gitlab auth testsJan-Willem van der Meer2014-09-081-11/+13
| * | | | | | Add new Gitlab::Oauth::AuthHash classJan-Willem van der Meer2014-09-041-0/+54
| * | | | | | Move auth hash to a seperate classJan-Willem van der Meer2014-09-043-87/+46
| * | | | | | Use instance methods of LDAP::User as wellJan-Willem van der Meer2014-09-032-52/+50
| * | | | | | Refactor Oauth::User class to use instance methodsJan-Willem van der Meer2014-09-033-72/+80
* | | | | | | Merge branch 'clickable-labels' into 'master'Dmitriy Zaporozhets2014-09-117-5/+27
|\ \ \ \ \ \ \
| * | | | | | | Clickable labels feature testDmitriy Zaporozhets2014-09-113-1/+19
| * | | | | | | Make labels clickableDmitriy Zaporozhets2014-09-114-4/+8
|/ / / / / / /
* | | | | | | Modified Gemfile.lockDmitriy Zaporozhets2014-09-111-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-09-111-1/+9
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'project-destroy-redirect' into 'master'Dmitriy Zaporozhets2014-09-111-1/+9
| |\ \ \ \ \ \
| | * | | | | | Incorporating Dmitriy's referrer-based routing suggestionKevin Boyd2014-09-051-1/+6
| | * | | | | | Fine-tune the Remove Project redirect. Now it redirects to admin_projects_pat...Kevin Boyd2014-08-291-1/+4
* | | | | | | | Merge branch 'root_password_configurable' into 'master'Dmitriy Zaporozhets2014-09-112-3/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add an option to supply root password through an environmental variable.Marin Jankovski2014-09-112-3/+13
|/ / / / / / /
* | | | | | | Merge pull request #7728 from bbodenmiller/patch-7Dmitriy Zaporozhets2014-09-111-5/+5
|\ \ \ \ \ \ \
| * | | | | | | cleanup MySQL doc wordingBen Bodenmiller2014-09-101-5/+5
* | | | | | | | Merge pull request #7730 from bbodenmiller/patch-12Dmitriy Zaporozhets2014-09-112-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | url -> URLBen Bodenmiller2014-09-101-1/+1
| * | | | | | | | url -> URLBen Bodenmiller2014-09-101-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #7732 from bbodenmiller/patch-13Dmitriy Zaporozhets2014-09-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Increase import timeout from 2 to 4 minutesBen Bodenmiller2014-09-101-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #7726 from cirosantilli/typo-locallyRobert Schilling2014-09-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Typo localy -> locally.Ciro Santilli2014-09-101-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-1020-113/+84
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #7705 from dblessing/serialize_service_propertiesDmitriy Zaporozhets2014-09-1020-113/+84
| |\ \ \ \ \ \ \
| | * | | | | | | Serialize services propertiesDrew Blessing2014-09-1020-113/+84
* | | | | | | | | Merge branch 'word_wrap_in_description' into 'master'Dmitriy Zaporozhets2014-09-101-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Wrap text that overflows the description field.Marin Jankovski2014-09-101-0/+2
* | | | | | | | | Merge pull request #7725 from matusb/feature/shibboleth-supportDmitriy Zaporozhets2014-09-105-0/+91
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | added omniauth-shibboleth gem for shibboleth supportMatus Banas2014-09-095-0/+91
* | | | | | | | | | Merge branch 'wrap_by_default_for_parallel' into 'master'Dmitriy Zaporozhets2014-09-102-4/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Wrap should always be enabled for parallel diff.Marin Jankovski2014-09-102-4/+5
* | | | | | | | | | | Merge branch 'gitlab-grit-2.6.11' into 'master'Dmitriy Zaporozhets2014-09-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update gitlab-grit to 2.6.11Jacob Vosmaer2014-09-101-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'update_omniauth_ldap' into 'master'Dmitriy Zaporozhets2014-09-102-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update omniauth-ldap and net-ldapJacob Vosmaer2014-09-102-5/+5
| |/ / / / / / / /
* | | | | | | | | Merge pull request #7724 from gitlabhq/revert-7252-masterMarin Jankovski2014-09-102-2/+2
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status