summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-1510-5/+27
|\
| * Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-1210-5/+27
* | 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-1546-40/+880
|\ \ \ \
| * | | | Use validate and required for environment and projectKamil Trzcinski2016-06-152-3/+3
| * | | | Make project_id, iid unique for deploymentsKamil Trzcinski2016-06-152-2/+469
| * | | | Validate project and environment instead of only requiringKamil Trzcinski2016-06-153-473/+6
| * | | | Make `project_id` and `environment_id` nullableenvironments-and-deploymentsKamil Trzcinski2016-06-153-5/+7
| * | | | Create_deployment ability is need to create retry or rollback deploymentKamil Trzcinski2016-06-152-3/+3
| * | | | Add CHANGELOGKamil Trzcinski2016-06-151-0/+1
| * | | | Make environments_spec more feature-specKamil Trzcinski2016-06-151-57/+56
| * | | | Improve cyclomatic of ability::allowedKamil Trzcinski2016-06-151-15/+1
| * | | | Improve forms and specsKamil Trzcinski2016-06-156-20/+22
| * | | | Improve validationsKamil Trzcinski2016-06-156-34/+31
| * | | | Improve design after reviewKamil Trzcinski2016-06-1414-69/+59
| * | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-1439-543/+1040
| |\ \ \ \
| * | | | | Update scss to make the views look nicerKamil Trzcinski2016-06-145-9/+13
| * | | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-1424-108/+817
| |\ \ \ \ \
| * | | | | | Test environment controller specsKamil Trzcinski2016-06-143-1/+168
| * | | | | | Properly create a new deployment after build successKamil Trzcinski2016-06-142-6/+68
| * | | | | | Authorize environments controller actionsKamil Trzcinski2016-06-144-2/+48
| * | | | | | Add gitlab-ci.yml documentation for environmentsKamil Trzcinski2016-06-141-0/+27
| * | | | | | Add specs for models and servicesKamil Trzcinski2016-06-1412-28/+139
| * | | | | | Validate environment name with regexKamil Trzcinski2016-06-144-10/+78
| * | | | | | 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-14109-647/+1420
| |\ \ \ \ \ \
| * | | | | | | Improved viewsPhil Hughes2016-06-134-46/+44
| * | | | | | | Add deployment viewsKamil Trzcinski2016-06-119-33/+74
| * | | | | | | Added initial version of deploymentsKamil Trzcinski2016-06-1022-111/+311
| * | | | | | | commit statusKamil Trzcinski2016-06-108-0/+138
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'seed-fu-award-emoji' into 'master' Douwe Maan2016-06-152-0/+37
|\ \ \ \ \ \ \
| * | | | | | | Random selection now also works for MySQLseed-fu-award-emojiZ.J. van de Weg2016-06-152-3/+7
| * | | | | | | Near half of the Issues get Award Emoji when seedingZ.J. van de Weg2016-06-151-4/+4
| * | | | | | | Skip system notes from receiving award emojiZ.J. van de Weg2016-06-151-4/+10
| * | | | | | | Seed Award Emoji while seeding the databaseZ.J. van de Weg2016-06-151-0/+27
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 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-153-0/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Added test to dropdown searchPhil Hughes2016-06-151-0/+16
| * | | | | | | | 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-154-43/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix teaspoon spec.17333-u2f-only-after-authenticatorTimothy Andrew2016-06-151-1/+2
| * | | | | | | | | Update `u2f_spec` to cover U2F being disabled until authenticator is set up.Timothy Andrew2016-06-151-34/+23
| * | | | | | | | | Don't allow clicking on "Setup New U2F Device" unless an authenticator app ha...Timothy Andrew2016-06-152-8/+15
* | | | | | | | | | Merge branch '18451-track-new-redis-connections' into 'master' Douwe Maan2016-06-153-1/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix spec description typo18451-track-new-redis-connectionsSean McGivern2016-06-141-1/+1
| * | | | | | | | | | Track new Redis connectionsSean McGivern2016-06-142-0/+17
View Lorry Controller Status