summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-153-0/+18
|\
| * Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-123-0/+18
* | Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-159-7/+434
|\ \
| * | Make `project_id` and `environment_id` nullableenvironments-and-deploymentsKamil Trzcinski2016-06-151-0/+2
| * | Make environments_spec more feature-specKamil Trzcinski2016-06-151-57/+56
| * | Improve forms and specsKamil Trzcinski2016-06-151-5/+7
| * | Improve validationsKamil Trzcinski2016-06-151-0/+1
| * | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-146-3/+246
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-147-10/+295
| |\ \ \
| * | | | Test environment controller specsKamil Trzcinski2016-06-141-0/+159
| * | | | Properly create a new deployment after build successKamil Trzcinski2016-06-141-4/+62
| * | | | Authorize environments controller actionsKamil Trzcinski2016-06-141-0/+43
| * | | | Add specs for models and servicesKamil Trzcinski2016-06-146-0/+111
| * | | | Validate environment name with regexKamil Trzcinski2016-06-141-7/+59
* | | | | Merge branch 'project-move-dropdown-search' into 'master' Jacob Schatz2016-06-151-0/+16
|\ \ \ \ \
| * | | | | Added test to dropdown searchPhil Hughes2016-06-151-0/+16
* | | | | | Merge branch '17333-u2f-only-after-authenticator' into 'master' Douwe Maan2016-06-152-35/+25
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | Merge branch '18451-track-new-redis-connections' into 'master' Douwe Maan2016-06-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix spec description typo18451-track-new-redis-connectionsSean McGivern2016-06-141-1/+1
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-1523-123/+1496
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'dont-drop-stuck-builds' into 'master' Stan Hu2016-06-151-3/+16
| |\ \ \ \ \ \ \
| | * | | | | | | Don't fail builds for projects that are deleted when they are stuckdont-drop-stuck-buildsKamil Trzcinski2016-06-121-3/+16
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-142-0/+49
| |\ \ \ \ \ \ \
| | * | | | | | | Todo service testsPhil Hughes2016-06-141-0/+16
| | * | | | | | | Todo tests and CHANGELOGPhil Hughes2016-06-141-0/+33
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Update tests to make it work with Turbolinks approachfix-bulk-assign-labels-initAlfredo Sumaran2016-06-142-20/+23
| * | | | | | | Filter out classes without names in the samplerYorick Peterse2016-06-141-7/+18
| * | | | | | | Merge branch '13948-access-request-to-projects-and-groups' into 'master' Douwe Maan2016-06-1417-93/+1390
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-1413-13/+541
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-1417-317/+372
| | * | | | | | | Factorize members mails into a new Emails::Members moduleRémy Coutable2016-06-141-77/+179
| | * | | | | | | Factorize access request routes into a new :access_requestable route concernRémy Coutable2016-06-141-2/+2
| | * | | | | | | Factorize #request_access and #approve_access_request into a new AccessReque...Rémy Coutable2016-06-142-6/+6
| | * | | | | | | Add request access for groupsRémy Coutable2016-06-1416-90/+1230
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | Fix notes on confidential issues through JSON to users without accessDouglas Barbosa Alexandre2016-06-141-0/+16
|/ / / / / / /
* | | | | | | Merge branch '18449-instrument-grape-endpoints' into 'master' Yorick Peterse2016-06-141-0/+29
|\ \ \ \ \ \ \
| * | | | | | | Instrument Grape Endpoint with Metrics::RackMiddleware18449-instrument-grape-endpointsPaco Guzman2016-06-141-0/+29
| |/ / / / / /
* | | | | | | Merge branch '18527-instrument-private-methods' into 'master' Yorick Peterse2016-06-141-2/+54
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Instrument private/protected methodsPaco Guzman2016-06-141-2/+54
| | |_|_|_|/ | |/| | | |
* | | | | | Fix Ci::Build#artifacts_expire_in= when assigning invalid durationartifacts-expire-dateKamil Trzcinski2016-06-141-1/+1
* | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-147-10/+295
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '18528-cpu-time-instrumentation' into 'master' Yorick Peterse2016-06-141-2/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Measure CPU time for instrumented methodsPaco Guzman2016-06-141-2/+2
| | |/ / /
| * | | | Merge branch 'refactor/ci-config-add-global-entry' into 'master' Rémy Coutable2016-06-146-8/+293
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make method that composes ci config entry privateGrzegorz Bizon2016-06-142-10/+1
| | * | | Merge branch 'master' into refactor/ci-config-add-global-entryGrzegorz Bizon2016-06-1320-67/+547
| | |\ \ \
| | * | | | Simplify ci config node factoryGrzegorz Bizon2016-06-131-5/+5
| | * | | | Duplicate CI config node factory on class levelGrzegorz Bizon2016-06-131-0/+35