summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Handle an undefined ci_id: this was keeping projects from being destroyedhandle-nil-ci-idStan Hu2016-04-061-0/+2
* Merge branch 'anti-memoizer-mr-fix' into 'master' Robert Speicher2016-04-072-1/+9
|\
| * Reset MR optsanti-memoizer-mr-fixJacob Schatz2016-04-062-1/+9
|/
* Merge branch 'saml-external-groups' into 'master' Robert Speicher2016-04-078-102/+207
|\
| * Implemented suggested fixesPatricio Cano2016-04-065-33/+21
| * 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 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-0710-18/+105
|\ \
| * | little refactor and improvements on specsGabriel Mazetto2016-04-063-13/+6
| * | Ensure correct filter order to validate with our markdown specpatch/fix-markdown-preview-wikisGabriel Mazetto2016-04-063-4/+8
| * | Fix a few edited references from WikiLinkFilter and specsGabriel Mazetto2016-04-063-6/+12
| * | Fixed WikiPipeline and specsGabriel Mazetto2016-04-062-4/+7
| * | Added WikiLinkFilterGabriel Mazetto2016-04-012-2/+56
| * | Fixed Gollum pages link url expansion to render correctly in previewGabriel Mazetto2016-03-302-6/+14
| * | Add specific markdown_preview route for WikisGabriel Mazetto2016-03-303-1/+20
* | | Merge branch 'issue_14952' into 'master' Jacob Schatz2016-04-061-2/+2
|\ \ \
| * \ \ Merge branch 'master' into issue_14952Alfredo Sumaran2016-04-0624-135/+399
| |\ \ \
| * | | | Use .new_record? insteadAlfredo Sumaran2016-04-061-2/+2
| * | | | Do not add location badge when creating a group or projectissue_14952Alfredo Sumaran2016-04-051-2/+2
* | | | | Merge branch '14866-url-overflow' into 'master' Jacob Schatz2016-04-065-3/+14
|\ \ \ \ \
| * | | | | Change word-break to word-wrapAnnabel Dunstone2016-04-061-1/+1
| * | | | | Horizontally scroll code blocks instead of wrapping14866-url-overflowAnnabel Dunstone2016-04-066-5/+15
| * | | | | Wrap code blocks to next lineAnnabel Dunstone2016-04-061-1/+2
* | | | | | Merge branch 'doc-missing-ticks' into 'master' Achilleas Pipinellis2016-04-061-2/+3
|\ \ \ \ \ \
| * | | | | | Fix missing entries in permission matrix [ci skip]Robert Schilling2016-04-061-2/+3
| * | | | | | Fix missing entries in permission matrix [ci skip]Robert Schilling2016-04-061-2/+2
* | | | | | | Merge branch 'patch/fix-ldap-unblock-user-logic' into 'master' Robert Speicher2016-04-062-2/+30
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Unblocks user when active_directory is disabled and it can be foundpatch/fix-ldap-unblock-user-logicGabriel Mazetto2016-04-052-2/+30
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'issue_14800' into 'master' Jacob Schatz2016-04-065-35/+64
|\ \ \ \ \ \
| * | | | | | Do not fire blur event when clicking a suggestionAlfredo Sumaran2016-04-061-2/+4
| * | | | | | Display clear button only if input has a valueAlfredo Sumaran2016-04-062-11/+12
| * | | | | | Change approach, do not use timeoutsAlfredo Sumaran2016-04-062-20/+14
| * | | | | | Do not create input if fieldName is not definedAlfredo Sumaran2016-04-051-1/+1
| * | | | | | Merge branch 'master' into issue_14800Alfredo Sumaran2016-04-04158-732/+1768
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Bring back search context when chosing the same project/groupAlfredo Sumaran2016-03-311-2/+23
| * | | | | | Return selected object if toggleLabel option is not definedAlfredo Sumaran2016-03-311-0/+2
| * | | | | | Add current element and event as params to clicked callbackAlfredo Sumaran2016-03-311-2/+3
| * | | | | | Skip default behaviour if we are clicking a result for the same locationAlfredo Sumaran2016-03-312-1/+9
| * | | | | | CSS tweaksAlfredo Sumaran2016-03-312-6/+6
* | | | | | | Merge branch 'fix-markdown-rendering' into 'master' Douwe Maan2016-04-062-1/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix header link rendering when containing numbersfix-markdown-renderingYorick Peterse2016-04-062-1/+9
* | | | | | | Fix wrong changelog itemRobert Schilling2016-04-061-1/+0
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'revert-api-retrieve-tag' into 'master' Robert Schilling2016-04-063-64/+1
|\ \ \ \ \ \
View Lorry Controller Status