summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'patch-1' into 'master' Robert Schilling2016-04-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fix Incorrect Quote In Docker Executor ExampleAlex Mayer2016-04-071-1/+1
* | | | | | | | | | Merge branch 'revert-missing-changelog' into 'master' Jacob Schatz2016-04-071-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove changelog entry for new navigation sidebar.Jacob Schatz2016-04-071-1/+0
* | | | | | | | | | | Merge branch 'code-wrapping' into 'master' Jacob Schatz2016-04-072-0/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix side-by-side code format & commit message wrapcode-wrappingAnnabel Dunstone2016-04-072-0/+6
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'revert-2ed6cd9e' into 'master' Jacob Schatz2016-04-0719-109/+130
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "Merge branch 'new-navigation-prototype' into 'master'"Jacob Schatz2016-04-0719-109/+130
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Update CHANGELOG for 8.6.5, 8.5.10, 8.4.8, and 8.3.7Robert Speicher2016-04-071-3/+17
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'revert-5e8740ee' into 'master' Jacob Schatz2016-04-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Revert "Merge branch 'fix-sidebar-exapnd' into 'master'"revert-5e8740eeJacob Schatz2016-04-071-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'indentation-bug' into 'master' Jacob Schatz2016-04-071-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Indentation updateindentation-bugAnnabel Dunstone2016-04-071-2/+0
| * | | | | | | | | Preserve white spaceAnnabel Dunstone2016-04-071-1/+3
* | | | | | | | | | Merge branch 'fix-number-of-todos-sidebar-is-not-updated' into 'master' Jacob Schatz2016-04-073-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update CHANGELOGfix-number-of-todos-sidebar-is-not-updatedDouglas Barbosa Alexandre2016-04-071-0/+1
| * | | | | | | | | | Update number of Todos in the sidebar when it's marked as "Done"Douglas Barbosa Alexandre2016-04-072-1/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'issue_14012' into 'master' Rémy Coutable2016-04-075-6/+42
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Implement review suggestionsFelipe Artur2016-04-074-7/+6
| * | | | | | | | | Improve codeFelipe Artur2016-04-053-17/+22
| * | | | | | | | | Improve codeFelipe Artur2016-04-051-7/+15
| * | | | | | | | | Fix problem when creating milestones in groups without projectsFelipe Artur2016-04-052-5/+29
* | | | | | | | | | 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