summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-152-0/+3
|\
| * Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-122-0/+3
* | Merge branch 'list-items' into 'master' Jacob Schatz2016-06-153-6/+6
|\ \
| * | Remove div between ul and lilist-itemsAnnabel Dunstone2016-06-133-6/+6
* | | Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-1510-1/+132
|\ \ \
| * | | Create_deployment ability is need to create retry or rollback deploymentKamil Trzcinski2016-06-151-1/+1
| * | | Improve forms and specsKamil Trzcinski2016-06-153-11/+11
| * | | Improve design after reviewKamil Trzcinski2016-06-147-31/+21
| * | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-143-57/+72
| |\ \ \
| * | | | Update scss to make the views look nicerKamil Trzcinski2016-06-144-9/+8
| * | | | Test environment controller specsKamil Trzcinski2016-06-141-1/+5
| * | | | Authorize environments controller actionsKamil Trzcinski2016-06-142-2/+3
| * | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-1423-122/+83
| |\ \ \ \
| * | | | | Improved viewsPhil Hughes2016-06-134-46/+44
| * | | | | Add deployment viewsKamil Trzcinski2016-06-116-22/+43
| * | | | | Added initial version of deploymentsKamil Trzcinski2016-06-105-91/+99
| * | | | | commit statusKamil Trzcinski2016-06-104-0/+111
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-header-logo-link' into 'master' Jacob Schatz2016-06-151-1/+1
|\ \ \ \ \
| * | | | | Fix #18604, logo in header wasn't an anchor link.fix-header-logo-linkConnor Shea2016-06-141-1/+1
* | | | | | Merge branch '17333-u2f-only-after-authenticator' into 'master' Douwe Maan2016-06-152-8/+15
|\ \ \ \ \ \
| * | | | | | Don't allow clicking on "Setup New U2F Device" unless an authenticator app ha...Timothy Andrew2016-06-152-8/+15
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-142-4/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Returns created todos to control rather than re-queryPhil Hughes2016-06-141-1/+1
| * | | | | Uses update URL to update the status of a todoPhil Hughes2016-06-141-1/+1
| * | | | | Moved todo creation over to project todos controllerPhil Hughes2016-06-141-1/+1
| * | | | | Cached jQuery selectorsPhil Hughes2016-06-141-5/+4
| * | | | | Fixed bug with sidebar when user is not logged inPhil Hughes2016-06-141-10/+12
| * | | | | Fixed issue with sidebar button stylingPhil Hughes2016-06-141-1/+1
| * | | | | Manually create todo for issuablePhil Hughes2016-06-142-4/+14
| |/ / / /
* | | | | Merge branch '18539-nav-alignment' into 'master' Jacob Schatz2016-06-141-10/+20
|\ \ \ \ \
| * | | | | Put all sidebar icons in fixed width containerAnnabel Dunstone2016-06-141-10/+20
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-143-47/+62
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'settings-dropdown-permissions' into 'master' Dmitriy Zaporozhets2016-06-142-49/+50
| |\ \ \ \
| | * | | | Pass can_edit and access to partial.Connor Shea2016-06-132-3/+1
| | * | | | Fix a bug that allowed Guests to still see Settings links they couldn't access.Connor Shea2016-06-101-1/+2
| | * | | | Fix displaying of project settings links the user cannot access.Connor Shea2016-06-102-48/+50
| * | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-143-5/+21
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Fix keep action of build artifacts widgetKamil Trzcinski2016-06-131-1/+1
| * | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-131-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-134-30/+4
| |\ \ \ \ \ \
| * | | | | | | Fixed spacing with row below in build sidebarPhil Hughes2016-06-131-1/+1
| * | | | | | | Added missing span element around timePhil Hughes2016-06-131-3/+3
| * | | | | | | Allow to show the time in the futureKamil Trzcinski2016-06-131-4/+7
| * | | | | | | Show the artifacts expiration prompt in Build Artifacts widgetKamil Trzcinski2016-06-131-17/+18
| * | | | | | | Move keep to ArtifactsControllerKamil Trzcinski2016-06-131-9/+10
| * | | | | | | Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+9
* | | | | | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-1433-151/+99
* | | | | | | | Factorize members mails into a new Emails::Members moduleRémy Coutable2016-06-1428-63/+51
* | | | | | | | Add request access for groupsRémy Coutable2016-06-1436-230/+188
* | | | | | | | Initial implementation of user access request to projectsDavid Alexander2016-06-148-3/+68
| |_|_|/ / / / |/| | | | | |