summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Indentation updateindentation-bugAnnabel Dunstone2016-04-071-2/+0
* Preserve white spaceAnnabel Dunstone2016-04-071-1/+3
* Merge branch 'regex-for-colons' into 'master' Douwe Maan2016-04-074-2/+118
|\
| * CHANGELOGJacob Schatz2016-04-071-0/+1
| * Remove dumb debug statement and add many tests.Jacob Schatz2016-04-073-2/+116
| * Add optional colon.Jacob Schatz2016-04-071-1/+2
* | Merge branch 'no-gc-auto' into 'master' Yorick Peterse2016-04-072-1/+13
|\ \
| * \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into no-gc-autoJacob Vosmaer2016-04-0775-374/+1052
| |\ \ | | |/
| * | Disable git gc --autoJacob Vosmaer2016-04-062-1/+13
* | | Merge branch 'dont-assign-me-if-you-arent-allow' into 'master' Rémy Coutable2016-04-071-6/+8
|\ \ \
| * | | Remove duplication. Remove JS data attributesJacob Schatz2016-04-071-6/+6
| * | | Hide "assign to me" link if not alloweddont-assign-me-if-you-arent-allowJacob Schatz2016-04-071-5/+7
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqGrzegorz Bizon2016-04-072-6/+110
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'fix/2fa-authentication-spoofing' into 'master' Rémy Coutable2016-04-072-6/+110
| |\ \ \
| | * | | Make sessions controller specs more explicitGrzegorz Bizon2016-04-071-4/+5
| | * | | Fix 2FA authentication spoofing vulnerabilityGrzegorz Bizon2016-04-072-41/+51
| | * | | Add specs for sessions controller including 2FAGrzegorz Bizon2016-04-061-0/+93
* | | | | Merge branch 'fix-project-404-cache-issue' into 'master' Yorick Peterse2016-04-072-0/+15
|\ \ \ \ \
| * | | | | Expire caches after project creation to ensure a consistent stateStan Hu2016-04-072-0/+15
* | | | | | 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
View Lorry Controller Status