Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative' | Douwe Maan | 2016-06-15 | 5 | -3/+6 |
|\ | |||||
| * | Fix Error 500 when viewing a blob with binary characters after the 1024-byte ... | Stan Hu | 2016-06-12 | 5 | -3/+6 |
* | | Merge branch 'list-items' into 'master' | Jacob Schatz | 2016-06-15 | 4 | -6/+7 |
|\ \ | |||||
| * | | Remove div between ul and lilist-items | Annabel Dunstone | 2016-06-13 | 4 | -6/+7 |
* | | | Merge branch 'zj-system-notes-not-awardable' into 'master' | Douwe Maan | 2016-06-15 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | Award Emoji can't be awarded on system notes backendzj-system-notes-not-awardable | Z.J. van de Weg | 2016-06-15 | 1 | -0/+4 |
* | | | | Merge branch 'environments-and-deployments' into 'master' | Rémy Coutable | 2016-06-15 | 25 | -18/+297 |
|\ \ \ \ | |||||
| * | | | | Use validate and required for environment and project | Kamil Trzcinski | 2016-06-15 | 2 | -3/+3 |
| * | | | | Validate project and environment instead of only requiring | Kamil Trzcinski | 2016-06-15 | 1 | -2/+2 |
| * | | | | Create_deployment ability is need to create retry or rollback deployment | Kamil Trzcinski | 2016-06-15 | 2 | -3/+3 |
| * | | | | Improve cyclomatic of ability::allowed | Kamil Trzcinski | 2016-06-15 | 1 | -15/+1 |
| * | | | | Improve forms and specs | Kamil Trzcinski | 2016-06-15 | 5 | -15/+15 |
| * | | | | Improve validations | Kamil Trzcinski | 2016-06-15 | 2 | -7/+3 |
| * | | | | Improve design after review | Kamil Trzcinski | 2016-06-14 | 13 | -67/+56 |
| * | | | | Merge remote-tracking branch 'origin/master' into environments-and-deployments | Kamil Trzcinski | 2016-06-14 | 8 | -68/+134 |
| |\ \ \ \ | |||||
| * | | | | | Update scss to make the views look nicer | Kamil Trzcinski | 2016-06-14 | 5 | -9/+13 |
| * | | | | | Test environment controller specs | Kamil Trzcinski | 2016-06-14 | 2 | -1/+9 |
| * | | | | | Properly create a new deployment after build success | Kamil Trzcinski | 2016-06-14 | 1 | -2/+6 |
| * | | | | | Authorize environments controller actions | Kamil Trzcinski | 2016-06-14 | 3 | -2/+5 |
| * | | | | | Add specs for models and services | Kamil Trzcinski | 2016-06-14 | 3 | -24/+22 |
| * | | | | | Validate environment name with regex | Kamil Trzcinski | 2016-06-14 | 1 | -1/+5 |
| * | | | | | Make retry action on pipeline to save a user | Kamil Trzcinski | 2016-06-14 | 2 | -3/+5 |
| * | | | | | Merge remote-tracking branch 'origin/master' into environments-and-deployments | Kamil Trzcinski | 2016-06-14 | 50 | -365/+322 |
| |\ \ \ \ \ | |||||
| * | | | | | | Improved views | Phil Hughes | 2016-06-13 | 4 | -46/+44 |
| * | | | | | | Add deployment views | Kamil Trzcinski | 2016-06-11 | 8 | -32/+73 |
| * | | | | | | Added initial version of deployments | Kamil Trzcinski | 2016-06-10 | 16 | -106/+217 |
| * | | | | | | commit status | Kamil Trzcinski | 2016-06-10 | 7 | -0/+136 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'fix-header-logo-link' into 'master' | Jacob Schatz | 2016-06-15 | 2 | -7/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix #18604, logo in header wasn't an anchor link.fix-header-logo-link | Connor Shea | 2016-06-14 | 2 | -7/+1 |
* | | | | | | | Merge branch 'project-move-dropdown-search' into 'master' | Jacob Schatz | 2016-06-15 | 2 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed issue with move dropdown not being searchableproject-move-dropdown-search | Phil Hughes | 2016-06-15 | 2 | -0/+5 |
* | | | | | | | | Merge branch '17333-u2f-only-after-authenticator' into 'master' | Douwe Maan | 2016-06-15 | 2 | -8/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Don't allow clicking on "Setup New U2F Device" unless an authenticator app ha... | Timothy Andrew | 2016-06-15 | 2 | -8/+15 |
* | | | | | | | | | Merge branch '14320-note-grouped_awards' into 'master' | Yorick Peterse | 2016-06-15 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Include user relationship when retrieving award_emoji14320-note-grouped_awards | Paco Guzman | 2016-06-15 | 1 | -2/+6 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-06-15 | 91 | -601/+831 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'dont-drop-stuck-builds' into 'master' | Stan Hu | 2016-06-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Don't fail builds for projects that are deleted when they are stuckdont-drop-stuck-builds | Kamil Trzcinski | 2016-06-12 | 1 | -1/+1 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'rs-fix-note-polling' into 'master' | Jacob Schatz | 2016-06-14 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix note polling when a window has been hiddenrs-fix-note-polling | Robert Speicher | 2016-06-13 | 1 | -2/+4 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' | Stan Hu | 2016-06-14 | 10 | -14/+117 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Returns created todos to control rather than re-query | Phil Hughes | 2016-06-14 | 3 | -4/+4 |
| | * | | | | | | | Updated TODO description | Phil Hughes | 2016-06-14 | 1 | -1/+1 |
| | * | | | | | | | Uses update URL to update the status of a todo | Phil Hughes | 2016-06-14 | 3 | -40/+50 |
| | * | | | | | | | Moved todo creation over to project todos controller | Phil Hughes | 2016-06-14 | 6 | -39/+31 |
| | * | | | | | | | Cached jQuery selectors | Phil Hughes | 2016-06-14 | 2 | -19/+19 |
| | * | | | | | | | Fixed bug with sidebar when user is not logged in | Phil Hughes | 2016-06-14 | 2 | -11/+15 |
| | * | | | | | | | Fixed issue with todo button not updating state | Phil Hughes | 2016-06-14 | 2 | -5/+5 |
| | * | | | | | | | Fixed issue with sidebar button styling | Phil Hughes | 2016-06-14 | 1 | -1/+1 |
| | * | | | | | | | todo title text update for manual todos | Phil Hughes | 2016-06-14 | 1 | -0/+1 |