summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Pinned sidebar navigation optionPhil Hughes2016-06-159-75/+123
* Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-155-3/+6
|\
| * Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-125-3/+6
* | Merge branch 'list-items' into 'master' Jacob Schatz2016-06-154-6/+7
|\ \
| * | Remove div between ul and lilist-itemsAnnabel Dunstone2016-06-134-6/+7
* | | Merge branch 'zj-system-notes-not-awardable' into 'master' Douwe Maan2016-06-151-0/+4
|\ \ \
| * | | Award Emoji can't be awarded on system notes backendzj-system-notes-not-awardableZ.J. van de Weg2016-06-151-0/+4
* | | | Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-1525-18/+297
|\ \ \ \
| * | | | Use validate and required for environment and projectKamil Trzcinski2016-06-152-3/+3
| * | | | Validate project and environment instead of only requiringKamil Trzcinski2016-06-151-2/+2
| * | | | Create_deployment ability is need to create retry or rollback deploymentKamil Trzcinski2016-06-152-3/+3
| * | | | Improve cyclomatic of ability::allowedKamil Trzcinski2016-06-151-15/+1
| * | | | Improve forms and specsKamil Trzcinski2016-06-155-15/+15
| * | | | Improve validationsKamil Trzcinski2016-06-152-7/+3
| * | | | Improve design after reviewKamil Trzcinski2016-06-1413-67/+56
| * | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-148-68/+134
| |\ \ \ \
| * | | | | Update scss to make the views look nicerKamil Trzcinski2016-06-145-9/+13
| * | | | | Test environment controller specsKamil Trzcinski2016-06-142-1/+9
| * | | | | Properly create a new deployment after build successKamil Trzcinski2016-06-141-2/+6
| * | | | | Authorize environments controller actionsKamil Trzcinski2016-06-143-2/+5
| * | | | | Add specs for models and servicesKamil Trzcinski2016-06-143-24/+22
| * | | | | Validate environment name with regexKamil Trzcinski2016-06-141-1/+5
| * | | | | Make retry action on pipeline to save a userKamil Trzcinski2016-06-142-3/+5
| * | | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-1450-365/+322
| |\ \ \ \ \
| * | | | | | Improved viewsPhil Hughes2016-06-134-46/+44
| * | | | | | Add deployment viewsKamil Trzcinski2016-06-118-32/+73
| * | | | | | Added initial version of deploymentsKamil Trzcinski2016-06-1016-106/+217
| * | | | | | commit statusKamil Trzcinski2016-06-107-0/+136
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix-header-logo-link' into 'master' Jacob Schatz2016-06-152-7/+1
|\ \ \ \ \ \
| * | | | | | Fix #18604, logo in header wasn't an anchor link.fix-header-logo-linkConnor Shea2016-06-142-7/+1
* | | | | | | Merge branch 'project-move-dropdown-search' into 'master' Jacob Schatz2016-06-152-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Fixed issue with move dropdown not being searchableproject-move-dropdown-searchPhil Hughes2016-06-152-0/+5
* | | | | | | | 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 '14320-note-grouped_awards' into 'master' Yorick Peterse2016-06-151-2/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Include user relationship when retrieving award_emoji14320-note-grouped_awardsPaco Guzman2016-06-151-2/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-1591-601/+831
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'dont-drop-stuck-builds' into 'master' Stan Hu2016-06-151-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Don't fail builds for projects that are deleted when they are stuckdont-drop-stuck-buildsKamil Trzcinski2016-06-121-1/+1
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'rs-fix-note-polling' into 'master' Jacob Schatz2016-06-141-2/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Fix note polling when a window has been hiddenrs-fix-note-pollingRobert Speicher2016-06-131-2/+4
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-1410-14/+117
| |\ \ \ \ \ \ \
| | * | | | | | | Returns created todos to control rather than re-queryPhil Hughes2016-06-143-4/+4
| | * | | | | | | Updated TODO descriptionPhil Hughes2016-06-141-1/+1
| | * | | | | | | Uses update URL to update the status of a todoPhil Hughes2016-06-143-40/+50
| | * | | | | | | Moved todo creation over to project todos controllerPhil Hughes2016-06-146-39/+31
| | * | | | | | | Cached jQuery selectorsPhil Hughes2016-06-142-19/+19
| | * | | | | | | Fixed bug with sidebar when user is not logged inPhil Hughes2016-06-142-11/+15
| | * | | | | | | Fixed issue with todo button not updating statePhil Hughes2016-06-142-5/+5
| | * | | | | | | Fixed issue with sidebar button stylingPhil Hughes2016-06-141-1/+1