Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative' | Douwe Maan | 2016-06-15 | 2 | -0/+3 |
|\ | |||||
| * | Fix Error 500 when viewing a blob with binary characters after the 1024-byte ... | Stan Hu | 2016-06-12 | 2 | -0/+3 |
* | | Merge branch 'list-items' into 'master' | Jacob Schatz | 2016-06-15 | 3 | -6/+6 |
|\ \ | |||||
| * | | Remove div between ul and lilist-items | Annabel Dunstone | 2016-06-13 | 3 | -6/+6 |
* | | | Merge branch 'environments-and-deployments' into 'master' | Rémy Coutable | 2016-06-15 | 10 | -1/+132 |
|\ \ \ | |||||
| * | | | Create_deployment ability is need to create retry or rollback deployment | Kamil Trzcinski | 2016-06-15 | 1 | -1/+1 |
| * | | | Improve forms and specs | Kamil Trzcinski | 2016-06-15 | 3 | -11/+11 |
| * | | | Improve design after review | Kamil Trzcinski | 2016-06-14 | 7 | -31/+21 |
| * | | | Merge remote-tracking branch 'origin/master' into environments-and-deployments | Kamil Trzcinski | 2016-06-14 | 3 | -57/+72 |
| |\ \ \ | |||||
| * | | | | Update scss to make the views look nicer | Kamil Trzcinski | 2016-06-14 | 4 | -9/+8 |
| * | | | | Test environment controller specs | Kamil Trzcinski | 2016-06-14 | 1 | -1/+5 |
| * | | | | Authorize environments controller actions | Kamil Trzcinski | 2016-06-14 | 2 | -2/+3 |
| * | | | | Merge remote-tracking branch 'origin/master' into environments-and-deployments | Kamil Trzcinski | 2016-06-14 | 23 | -122/+83 |
| |\ \ \ \ | |||||
| * | | | | | Improved views | Phil Hughes | 2016-06-13 | 4 | -46/+44 |
| * | | | | | Add deployment views | Kamil Trzcinski | 2016-06-11 | 6 | -22/+43 |
| * | | | | | Added initial version of deployments | Kamil Trzcinski | 2016-06-10 | 5 | -91/+99 |
| * | | | | | commit status | Kamil Trzcinski | 2016-06-10 | 4 | -0/+111 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'fix-header-logo-link' into 'master' | Jacob Schatz | 2016-06-15 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix #18604, logo in header wasn't an anchor link.fix-header-logo-link | Connor Shea | 2016-06-14 | 1 | -1/+1 |
* | | | | | | 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 'manual-todos-issuable-sidebar' into 'master' | Stan Hu | 2016-06-14 | 2 | -4/+15 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Returns created todos to control rather than re-query | Phil Hughes | 2016-06-14 | 1 | -1/+1 |
| * | | | | | Uses update URL to update the status of a todo | Phil Hughes | 2016-06-14 | 1 | -1/+1 |
| * | | | | | Moved todo creation over to project todos controller | Phil Hughes | 2016-06-14 | 1 | -1/+1 |
| * | | | | | Cached jQuery selectors | Phil Hughes | 2016-06-14 | 1 | -5/+4 |
| * | | | | | Fixed bug with sidebar when user is not logged in | Phil Hughes | 2016-06-14 | 1 | -10/+12 |
| * | | | | | Fixed issue with sidebar button styling | Phil Hughes | 2016-06-14 | 1 | -1/+1 |
| * | | | | | Manually create todo for issuable | Phil Hughes | 2016-06-14 | 2 | -4/+14 |
| |/ / / / | |||||
* | | | | | Merge branch '18539-nav-alignment' into 'master' | Jacob Schatz | 2016-06-14 | 1 | -10/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Put all sidebar icons in fixed width container | Annabel Dunstone | 2016-06-14 | 1 | -10/+20 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'master' into 13948-access-request-to-projects-and-groups | Douwe Maan | 2016-06-14 | 3 | -47/+62 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'settings-dropdown-permissions' into 'master' | Dmitriy Zaporozhets | 2016-06-14 | 2 | -49/+50 |
| |\ \ \ \ | |||||
| | * | | | | Pass can_edit and access to partial. | Connor Shea | 2016-06-13 | 2 | -3/+1 |
| | * | | | | Fix a bug that allowed Guests to still see Settings links they couldn't access. | Connor Shea | 2016-06-10 | 1 | -1/+2 |
| | * | | | | Fix displaying of project settings links the user cannot access. | Connor Shea | 2016-06-10 | 2 | -48/+50 |
| * | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-date | Kamil Trzcinski | 2016-06-14 | 3 | -5/+21 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Fix keep action of build artifacts widget | Kamil Trzcinski | 2016-06-13 | 1 | -1/+1 |
| * | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-date | Kamil Trzcinski | 2016-06-13 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into artifacts-expire-date | Kamil Trzcinski | 2016-06-13 | 4 | -30/+4 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fixed spacing with row below in build sidebar | Phil Hughes | 2016-06-13 | 1 | -1/+1 |
| * | | | | | | | Added missing span element around time | Phil Hughes | 2016-06-13 | 1 | -3/+3 |
| * | | | | | | | Allow to show the time in the future | Kamil Trzcinski | 2016-06-13 | 1 | -4/+7 |
| * | | | | | | | Show the artifacts expiration prompt in Build Artifacts widget | Kamil Trzcinski | 2016-06-13 | 1 | -17/+18 |
| * | | | | | | | Move keep to ArtifactsController | Kamil Trzcinski | 2016-06-13 | 1 | -9/+10 |
| * | | | | | | | Allow to expire build artifacts | Kamil Trzcinski | 2016-06-13 | 1 | -0/+9 |
* | | | | | | | | UI and copywriting improvements13948-access-request-to-projects-and-groups | Rémy Coutable | 2016-06-14 | 33 | -151/+99 |
* | | | | | | | | Factorize members mails into a new Emails::Members module | Rémy Coutable | 2016-06-14 | 28 | -63/+51 |
* | | | | | | | | Add request access for groups | Rémy Coutable | 2016-06-14 | 36 | -230/+188 |
* | | | | | | | | Initial implementation of user access request to projects | David Alexander | 2016-06-14 | 8 | -3/+68 |
| |_|_|/ / / / |/| | | | | | |