summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Filtering by any label keeps the text on the toggle buttonlabel-filterPhil Hughes2016-04-122-1/+10
* Added label filter testsPhil Hughes2016-04-071-0/+22
* Fixed issue with any label & no label filters missingPhil Hughes2016-04-071-1/+1
* Merge branch 'update_main_lang_if_unset' into 'master' Rémy Coutable2016-04-073-10/+27
|\
| * Only update main language if it is not already setupdate_main_lang_if_unsetDrew Blessing2016-04-063-10/+27
* | Merge branch 'api-filter-milestone' into 'master' Rémy Coutable2016-04-074-6/+54
|\ \
| * | Improve coding and doc styleRobert Schilling2016-04-064-10/+21
| * | API: Ability to filter milestones by stateRobert Schilling2016-04-064-2/+39
* | | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-079-10/+137
|\ \ \
| * | | Fix Changelog entries after rebasefeature/expose-builds-badgeGrzegorz Bizon2016-04-061-2/+0
| * | | Use default branch when displaying list of badgesGrzegorz Bizon2016-04-061-1/+1
| * | | Add Changelog entry for project badges in settingsGrzegorz Bizon2016-04-061-0/+3
| * | | Change name of badge variable in badges controllerGrzegorz Bizon2016-04-062-4/+4
| * | | Remove obsolete badge code from project viewGrzegorz Bizon2016-04-061-3/+0
| * | | Add feature specs for list of badges pageGrzegorz Bizon2016-04-061-0/+34
| * | | Expose project badges in project settings menuGrzegorz Bizon2016-04-062-1/+8
| * | | Make it possible to switch ref in badges viewGrzegorz Bizon2016-04-062-0/+4
| * | | Add project header title in project badges viewGrzegorz Bizon2016-04-061-0/+2
| * | | Use highlight helper to render badges code syntaxGrzegorz Bizon2016-04-061-4/+4
| * | | Improve view with list of badgesGrzegorz Bizon2016-04-061-7/+12
| * | | Extend build status badge, add html/markdown methodsGrzegorz Bizon2016-04-064-8/+63
| * | | Add project badges view prototypeGrzegorz Bizon2016-04-064-2/+23
| * | | Improve routes for project badgesGrzegorz Bizon2016-04-061-3/+4
| |/ /
* | | Merge branch 'fix_14638' into 'master' Rémy Coutable2016-04-073-1/+25
|\ \ \
| * | | Fixes #14638.PotHix2016-04-063-1/+25
* | | | Merge branch 'return-303-for-branch-deletion' into 'master' Rémy Coutable2016-04-074-2/+19
|\ \ \ \
| * | | | Return status code 303 after a branch DELETE operation to avoid project deletionStan Hu2016-04-064-2/+19
* | | | | Merge branch 'update-coveralls' into 'master' Jeroen van Baarsen2016-04-072-16/+6
|\ \ \ \ \
| * | | | | Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2connorshea2016-04-062-16/+6
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling2016-04-071-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #10118 from yasserhussain1110/unprotect-branch-not-found-m...Rémy Coutable2016-04-061-1/+1
| |\ \ \ \ \ \
| | * | | | | | Changed the argument of not_found for 'unprotect'Yasser Hussain2016-04-061-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'patch-1' into 'master' Robert Schilling2016-04-071-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [ci skip] Fix typo.frodsan2016-04-061-1/+1
* | | | | | | 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