Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update CHANGELOGfix-number-of-todos-sidebar-is-not-updated | Douglas Barbosa Alexandre | 2016-04-07 | 1 | -0/+1 |
* | Update number of Todos in the sidebar when it's marked as "Done" | Douglas Barbosa Alexandre | 2016-04-07 | 2 | -1/+3 |
* | Merge branch 'regex-for-colons' into 'master' | Douwe Maan | 2016-04-07 | 4 | -2/+118 |
|\ | |||||
| * | CHANGELOG | Jacob Schatz | 2016-04-07 | 1 | -0/+1 |
| * | Remove dumb debug statement and add many tests. | Jacob Schatz | 2016-04-07 | 3 | -2/+116 |
| * | Add optional colon. | Jacob Schatz | 2016-04-07 | 1 | -1/+2 |
* | | Merge branch 'no-gc-auto' into 'master' | Yorick Peterse | 2016-04-07 | 2 | -1/+13 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into no-gc-auto | Jacob Vosmaer | 2016-04-07 | 75 | -374/+1052 |
| |\ \ | | |/ | |||||
| * | | Disable git gc --auto | Jacob Vosmaer | 2016-04-06 | 2 | -1/+13 |
* | | | Merge branch 'dont-assign-me-if-you-arent-allow' into 'master' | Rémy Coutable | 2016-04-07 | 1 | -6/+8 |
|\ \ \ | |||||
| * | | | Remove duplication. Remove JS data attributes | Jacob Schatz | 2016-04-07 | 1 | -6/+6 |
| * | | | Hide "assign to me" link if not alloweddont-assign-me-if-you-arent-allow | Jacob Schatz | 2016-04-07 | 1 | -5/+7 |
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Grzegorz Bizon | 2016-04-07 | 2 | -6/+110 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge branch 'fix/2fa-authentication-spoofing' into 'master' | Rémy Coutable | 2016-04-07 | 2 | -6/+110 |
| |\ \ \ | |||||
| | * | | | Make sessions controller specs more explicit | Grzegorz Bizon | 2016-04-07 | 1 | -4/+5 |
| | * | | | Fix 2FA authentication spoofing vulnerability | Grzegorz Bizon | 2016-04-07 | 2 | -41/+51 |
| | * | | | Add specs for sessions controller including 2FA | Grzegorz Bizon | 2016-04-06 | 1 | -0/+93 |
* | | | | | Merge branch 'fix-project-404-cache-issue' into 'master' | Yorick Peterse | 2016-04-07 | 2 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Expire caches after project creation to ensure a consistent state | Stan Hu | 2016-04-07 | 2 | -0/+15 |
* | | | | | | Merge branch 'update_main_lang_if_unset' into 'master' | Rémy Coutable | 2016-04-07 | 3 | -10/+27 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Only update main language if it is not already setupdate_main_lang_if_unset | Drew Blessing | 2016-04-06 | 3 | -10/+27 |
* | | | | | | Merge branch 'api-filter-milestone' into 'master' | Rémy Coutable | 2016-04-07 | 4 | -6/+54 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Improve coding and doc style | Robert Schilling | 2016-04-06 | 4 | -10/+21 |
| * | | | | | | API: Ability to filter milestones by state | Robert Schilling | 2016-04-06 | 4 | -2/+39 |
* | | | | | | | Merge branch 'feature/expose-builds-badge' into 'master' | Rémy Coutable | 2016-04-07 | 9 | -10/+137 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix Changelog entries after rebasefeature/expose-builds-badge | Grzegorz Bizon | 2016-04-06 | 1 | -2/+0 |
| * | | | | | | | Use default branch when displaying list of badges | Grzegorz Bizon | 2016-04-06 | 1 | -1/+1 |
| * | | | | | | | Add Changelog entry for project badges in settings | Grzegorz Bizon | 2016-04-06 | 1 | -0/+3 |
| * | | | | | | | Change name of badge variable in badges controller | Grzegorz Bizon | 2016-04-06 | 2 | -4/+4 |
| * | | | | | | | Remove obsolete badge code from project view | Grzegorz Bizon | 2016-04-06 | 1 | -3/+0 |
| * | | | | | | | Add feature specs for list of badges page | Grzegorz Bizon | 2016-04-06 | 1 | -0/+34 |
| * | | | | | | | Expose project badges in project settings menu | Grzegorz Bizon | 2016-04-06 | 2 | -1/+8 |
| * | | | | | | | Make it possible to switch ref in badges view | Grzegorz Bizon | 2016-04-06 | 2 | -0/+4 |
| * | | | | | | | Add project header title in project badges view | Grzegorz Bizon | 2016-04-06 | 1 | -0/+2 |
| * | | | | | | | Use highlight helper to render badges code syntax | Grzegorz Bizon | 2016-04-06 | 1 | -4/+4 |
| * | | | | | | | Improve view with list of badges | Grzegorz Bizon | 2016-04-06 | 1 | -7/+12 |
| * | | | | | | | Extend build status badge, add html/markdown methods | Grzegorz Bizon | 2016-04-06 | 4 | -8/+63 |
| * | | | | | | | Add project badges view prototype | Grzegorz Bizon | 2016-04-06 | 4 | -2/+23 |
| * | | | | | | | Improve routes for project badges | Grzegorz Bizon | 2016-04-06 | 1 | -3/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'fix_14638' into 'master' | Rémy Coutable | 2016-04-07 | 3 | -1/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixes #14638. | PotHix | 2016-04-06 | 3 | -1/+25 |
* | | | | | | | | Merge branch 'return-303-for-branch-deletion' into 'master' | Rémy Coutable | 2016-04-07 | 4 | -2/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Return status code 303 after a branch DELETE operation to avoid project deletion | Stan Hu | 2016-04-06 | 4 | -2/+19 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'update-coveralls' into 'master' | Jeroen van Baarsen | 2016-04-07 | 2 | -16/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2 | connorshea | 2016-04-06 | 2 | -16/+6 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Robert Schilling | 2016-04-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge pull request #10118 from yasserhussain1110/unprotect-branch-not-found-m... | Rémy Coutable | 2016-04-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Changed the argument of not_found for 'unprotect' | Yasser Hussain | 2016-04-06 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'patch-1' into 'master' | Robert Schilling | 2016-04-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | [ci skip] Fix typo. | frodsan | 2016-04-06 | 1 | -1/+1 |