summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update chrome version and the binary path33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-betaGrzegorz Bizon2017-06-222-2/+2
|
* add CHANGELOG.md entry for !12071Mike Greiling2017-06-211-0/+4
|
* rename DRIVER_VERSION environment variable to CHROME_DRIVER_VERSIONMike Greiling2017-06-211-2/+2
|
* update chrome version and chromedriverMike Greiling2017-06-211-4/+8
|
* Update Dockerfile to utilize the stable release of Google Chrome 59Mike Greiling2017-06-211-3/+3
|
* Merge branch 'bvl-validate-path-update' into 'master'Douwe Maan2017-06-213-9/+18
|\ | | | | | | | | | | | | Rebuild the dynamic path before validating it Closes #33746 See merge request !12213
| * Rebuild the dynamic path before validating itbvl-validate-path-updateBob Van Landuyt2017-06-213-9/+18
| | | | | | | | | | Otherwise we won't validate updates to the path. Allowing users to change the path to something that's not allowed.
* | Merge branch 'backport-check-project-feature' into 'master'Douwe Maan2017-06-217-32/+20
|\ \ | | | | | | | | | | | | Backport "check_project_feature_available!" from EE and use it for CE controllers See merge request !12305
| * | Use the new check_project_feature_available! method in project controllersNick Thomas2017-06-217-32/+13
| | |
| * | Backport check_project_feature_available! from EENick Thomas2017-06-211-1/+8
| | |
* | | Merge branch 'fix/gb/improve-autocancel-pipelines-migraton' into 'master'Kamil Trzciński2017-06-211-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Disable statement timeout in CI pipelines migration See merge request !12268
| * | | Disable statement timeout in CI pipelines migrationfix/gb/improve-autocancel-pipelines-migratonGrzegorz Bizon2017-06-191-0/+2
| | | |
* | | | Merge branch 'winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4d' into ↵Jacob Schatz2017-06-2110-262/+111
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Revert "Merge branch 'winh-merge-request-related-issues' into 'master'" See merge request !12354
| * | | | Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4dwinh2017-06-2110-262/+111
| | |_|/ | |/| | | | | | | | | | | | | | This reverts commit 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d, reversing changes made to 025cbc2ad4dc175634676ff8a6955e043512d8bf.
* | | | Merge branch '34008-fix-CI_ENVIRONMENT_URL-2' into 'master'Kamil Trzciński2017-06-215-55/+95
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't expand CI_ENVIRONMENT_URL so runner would do Closes #34008 See merge request !12344
| * | | | Memorize the value in methods rather than local34008-fix-CI_ENVIRONMENT_URL-2Lin Jen-Shin2017-06-211-6/+10
| | | | |
| * | | | Expand with all the variables so that things likeLin Jen-Shin2017-06-213-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | CI_ENVIRONMENT_SLUG is also available. It won't be recursive because we're not putting this value in the variables.
| * | | | Move expanded_environment_url to CreateDeploymentServiceLin Jen-Shin2017-06-214-58/+57
| | | | | | | | | | | | | | | | | | | | Because that's the only place we need it.
| * | | | Add comments to explain some culprit; Add changelogLin Jen-Shin2017-06-212-2/+13
| | | | |
| * | | | Don't expand CI_ENVIRONMENT_URL so runner would doLin Jen-Shin2017-06-213-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And make sure CI_ENVIRONMENT_URL comes last so all variables would be available whenever the runner is trying to expand it. This is an alternative to !12333
* | | | | Merge branch 'rubocop/gb/enable-dot-position-cop-leading-style' into 'master'Rémy Coutable2017-06-21359-2849/+2844
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/DotPosition Rubocop :cop: See merge request !11965
| * | | | | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-21359-2849/+2844
|/ / / / /
* | | | | Merge branch 'disable-environment-list-polling' into 'master'Grzegorz Bizon2017-06-213-4/+8
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Disable environment list polling as it breaks deployboard See merge request !12347
| * | | | Disable environment list polling as it breaks deployboardKamil Trzcinski2017-06-213-4/+8
| | |_|/ | |/| |
* | | | Merge branch '33837-remove-trash-on-registry-image' into 'master'Rémy Coutable2017-06-212-7/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove registry image delete button if user cant delete it Closes #33837 See merge request !12317
| * | | | Remove registry image delete button if user cant delete itvanadium232017-06-212-7/+12
| | | | |
* | | | | Merge branch 'replase_spinach_spec_create.feature' into 'master'Rémy Coutable2017-06-213-14/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace 'create.feature' spinach test with an rspec analog See merge request !12343
| * | | | | Replace 'create.feature' spinach test with an rspec analogblackst0ne2017-06-213-14/+31
| | |/ / / | |/| | |
* | | | | Merge branch 'add-index-for-head-pipeline-id' into 'master'Yorick Peterse2017-06-212-1/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add index for head pipeline See merge request !12273
| * | | | | Add index for head pipeline idadd-index-for-head-pipeline-idKamil Trzcinski2017-06-212-1/+17
| |/ / / /
* | | | | Merge branch 'zj-environment-creation-regex-fix' into 'master'Grzegorz Bizon2017-06-213-2/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace invalid chars while seeding environments Closes #30855 See merge request !12267
| * | | | | Replace invalid chars while seeding environmentsZeger-Jan van de Weg2017-06-213-2/+14
|/ / / / /
* | | | | Merge branch '33878-fix-edit-deploy-key' into 'master'Rémy Coutable2017-06-215-3/+34
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix edit button for deploy keys available from other projects Closes #33878 See merge request !12301
| * | | | Fix edit button for deploy keys available from other projectsAlexander Randa2017-06-205-3/+34
| | | | |
* | | | | Merge branch 'docs/fix-broken-links' into 'master'Rémy Coutable2017-06-211-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix broken relative URL in prometheus docs Closes #34050 See merge request !12340
| * | | | Fix broken relative URL in prometheus docsAchilleas Pipinellis2017-06-211-1/+1
|/ / / /
* | | | Update CHANGELOG.md for 9.2.7Timothy Andrew2017-06-212-4/+4
| | | | | | | | | | | | [ci skip]
* | | | Merge branch '34017-common-vue' into 'master'Tim Zallmann2017-06-212-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove vue from main.bundle.js Closes #34017 See merge request !12327
| * | | | Remove vue from main.bundle.js file being loaded through ↵34017-common-vueFilipa Lacerda2017-06-212-3/+6
| | |/ / | |/| | | | | | | | | | `app/assets/javascripts/merge_request_tabs.js`
* | | | Merge branch 'dt/printing-to-api' into 'master'Rémy Coutable2017-06-214-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | add printing_merge_request_link_enabled to API See merge request !12240
| * | | | add printing_merge_request_link_enabled to APIDavid Turner2017-06-194-0/+10
| | | | |
* | | | | Merge branch 'gitaly-auth-token' into 'master'Sean McGivern2017-06-2112-43/+77
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pass Gitaly token on Ruby gRPC requests See merge request !12228
| * | | | | Enable gitaly token auth when testingJacob Vosmaer2017-06-203-2/+5
| | | | | |
| * | | | | Rubocop and comment fixesJacob Vosmaer2017-06-203-5/+7
| | | | | |
| * | | | | Send gitaly token to workhorse when neededJacob Vosmaer2017-06-202-4/+13
| | | | | |
| * | | | | Pass Gitaly token on Ruby gRPC requestsJacob Vosmaer2017-06-198-37/+57
| | | | | |
* | | | | | Merge branch 'remove-git-commit-attribute' into 'master'Sean McGivern2017-06-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused attr_accessor from Gitlab::Git::Commit See merge request !12311
| * | | | | | Remove unused attr_accessor from Gitlab::Git::CommitJacob Vosmaer2017-06-201-1/+1
| |/ / / / /
* | | | | | Merge branch ↵Rémy Coutable2017-06-212-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33502-make-gitlab-project-issue-description-templates-less-specific-with-the-project-they-reference' into 'master' Mention both CE and EE issue trackers in description templates Closes #33502 See merge request !12326
| * | | | | | Mention both CE and EE issue trackers in description templatesMark Fletcher2017-06-212-1/+14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | [skip ci]