summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Break asset image build out into separate scriptadd-docker-assets-imageIan Baum2018-10-302-8/+22
| | | | * Allow for better formatting to increase readability
* Switch back to gitlab-assets-XX for image nameIan Baum2018-10-251-2/+1
|
* Add docker tag back to gitlab:assets:compileIan Baum2018-10-241-1/+3
|
* Change assets image nameIan Baum2018-10-241-1/+2
| | | | Change from gitlab-assets-XX to gitlab-XX-assets
* Remove tag from gitlab:compile:assetsIan Baum2018-10-231-2/+0
| | | | gitlabhq in dev.gitlab.org does not have any docker runners
* Switch tag for gitlab:assets:compileIan Baum2018-10-231-1/+1
| | | | Need to test build on dev
* Use docker registry for currently active projectIan Baum2018-10-222-6/+6
|
* Use project name in container name for Rails assetsIan Baum2018-10-121-1/+1
|
* Uncomment docker push for gitlab:assets:compileIan Baum2018-10-121-1/+1
|
* Use docker image for gitlab:assets:compileIan Baum2018-10-121-0/+1
|
* Combine gitlab:assets:compile with assets_containerIan Baum2018-10-111-23/+12
|
* Lowercase registry path for assets_containerIan Baum2018-10-101-1/+1
|
* Build a docker container storing only the frontent assetsIan Baum2018-10-102-0/+29
| | | | | * Will be used by omnibus-gitlab and the CNG images to avoid compiling multiple times
* Merge branch 'patch-29' into 'master'Rémy Coutable2018-10-091-1/+1
|\ | | | | | | | | Remove a duplicated word in the README file See merge request gitlab-org/gitlab-ce!22200
| * Update README.mdpockata2018-10-081-1/+1
| |
* | Merge branch '52233-harmonize-eslint-prettier' into 'master'Fatih Acet2018-10-0966-115/+93
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Harmonize prettier and eslint configs" Closes #52233 See merge request gitlab-org/gitlab-ce!22126
| * | Resolve "Harmonize prettier and eslint configs"Mike Greiling2018-10-0966-115/+93
|/ /
* | Merge branch 'improve-downstream-pipeline-trigger' into 'master'Nick Thomas2018-10-091-24/+49
|\ \ | | | | | | | | | | | | Improve downstream pipeline trigger class See merge request gitlab-org/gitlab-ce!22110
| * | Improve downstream pipeine trigger classRémy Coutable2018-10-081-24/+49
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'qa-304-auto-devops-open-live-environment' into 'master'Rémy Coutable2018-10-098-2/+73
|\ \ \ | | | | | | | | | | | | | | | | Assert prod environment is live after Auto Devops See merge request gitlab-org/gitlab-ce!22131
| * | | Move to using qa-* selectorsThong Kuah2018-10-096-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the corresponding qa-* classes into the view files for each new Page element we added. Adjust the click actions to match.
| * | | Assert prod environment is live after Auto DevopsThong Kuah2018-10-085-0/+69
| | | | | | | | | | | | | | | | | | | | Goes to Operations > Environments and clicks on the "View deployment" link for production.
* | | | Merge branch '43953-add-troubleshooting-to-github-import' into 'master'Achilleas Pipinellis2018-10-091-14/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc-Resolve "Add Troubleshooting to Github Import" Closes #43953 See merge request gitlab-org/gitlab-ce!17583
| * | | | Refactor GitHub import raketask docsAchilleas Pipinellis2018-10-091-36/+18
| | | | |
| * | | | Update github_import.mdDavin Walker2018-10-091-0/+22
| | | | |
* | | | | Merge branch 'docs-improve-repository_files' into 'master'Achilleas Pipinellis2018-10-091-3/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve the Repository files documentation See merge request gitlab-org/gitlab-ce!22225
| * | | | | Improve the Repository files documentationRémy Coutable2018-10-091-3/+12
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'qa_spec_admin_cluster_create_cluster_role_binding' into 'master'Rémy Coutable2018-10-091-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | QA: Use basic auth to create cluster role binding See merge request gitlab-org/gitlab-ce!22190
| * | | | | Fix commands for kubectl >= 1.12Thong Kuah2018-10-091-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `--username` and `--password` top level options have been removed. Fortunately we have a backwards compatible way of setting the credentials via `kubectl config set-credentials <name>`, and using the `--user <name>` top level option which is available at least in 1.10 (and possibly farther back).
| * | | | | Use basic auth to create cluster role bindingThong Kuah2018-10-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The alternative is the user has `container.admin` permissions. This approach is preferred as this means the QA spec can be run by any GitLabber and indeed any contributor who can create a GKE cluster.
* | | | | | Merge branch 'docs/rs-feature-flag-check-by-default' into 'master'Yorick Peterse2018-10-091-0/+24
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for feature flags defaulting to on Closes gitlab-ee#7883 See merge request gitlab-org/gitlab-ce!22157
| * | | | | Documentation for feature flags defaulting to onRobert Speicher2018-10-051-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7883
* | | | | | Merge branch 'tsumitsu-master-patch-1' into 'master'Achilleas Pipinellis2018-10-096-49/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs/Tsumitsu Fix render issue in GFM documentation page See merge request gitlab-org/gitlab-ce!21997
| * | | | | | docs/Tsumitsu Fix render issue in GFM documentation pagesmit_tooned2018-10-096-49/+25
|/ / / / / /
* | | | | | Merge branch '52408-pip-cache-dir-to-cache-python-dependencies' into 'master'Kamil Trzciński2018-10-093-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the standard PIP_CACHE_DIR for Python dependency caching template Closes #52408 See merge request gitlab-org/gitlab-ce!22211
| * | | | | | Use the standard PIP_CACHE_DIR for Python dependency caching templateTakuya Noguchi2018-10-093-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | Merge branch 'docs/fix-docs-structure-links' into 'master'Achilleas Pipinellis2018-10-091-21/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix links that 404 and style changes See merge request gitlab-org/gitlab-ce!22209
| * | | | | | | Fix links that 404 and style changesEvan Read2018-10-091-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some links internal links were incorrect. - Removed some #overview anchor links, because they don't jump much content. - Made text confirm to suggested proselint and mardownlint rules.
* | | | | | | | Merge branch 'sh-handle-invalid-comparison' into 'master'Douwe Maan2018-10-093-0/+46
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject invalid branch names in repository compare controller Closes #51003 See merge request gitlab-org/gitlab-ce!22186
| * | | | | | | | Reject invalid branch names in repository compare controllerStan Hu2018-10-083-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #51003
* | | | | | | | | Merge branch 'rails5-user-status-spec' into 'master'Sean McGivern2018-10-092-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5: fix user edit profile clear status spec See merge request gitlab-org/gitlab-ce!22169
| * | | | | | | | | Rails5: fix user edit profile clear status specJasper Maes2018-10-062-0/+7
| | | | | | | | | |
* | | | | | | | | | Merge branch 'update-code-of-conduct' into 'master'Rémy Coutable2018-10-091-20/+64
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to latest version of contributor-covenant. See merge request gitlab-org/gitlab-ce!21995
| * | | | | | | | | | Update to latest version of contributor-covenantJacob Schatz2018-10-091-20/+64
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ml-qa-skip-signup-disabled' into 'master'Rémy Coutable2018-10-095-19/+55
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Allow the registration e2e test to be skipped See merge request gitlab-org/gitlab-ce!22205
| * | | | | | | | | Allow the registration e2e test to be skippedMark Lapierre2018-10-085-19/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SIGNUP_DISABLED is true skip any tests with a context :skip_signup_disabled. The context is set for the registration tests. This allows the tests to be skipped when run on the staging, which doesn't allow registration
* | | | | | | | | | Merge branch 'sh-bump-rugged-0.27.5' into 'master'Robert Speicher2018-10-082-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump rugged to 0.27.5 for security fixes See merge request gitlab-org/gitlab-ce!22208
| * | | | | | | | | Bump rugged to 0.27.5 for security fixesStan Hu2018-10-082-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | See: https://github.com/libgit2/libgit2/releases
* | | | | | | | | Merge branch ↵Mike Greiling2018-10-082-2/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52353-keyboard-navigation-project-slug-is-not-focused-on-new-project-page' into 'master' Resolve "Keyboard navigation: "Project slug" is not focused on "New project" page" Closes #52353 See merge request gitlab-org/gitlab-ce!22198
| * | | | | | | | | Focus project slug on tab navigationMartin Wortschack2018-10-082-2/+7
| | |_|_|_|_|_|_|/ | |/| | | | | | |
View Lorry Controller Status