summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* more indentation fixesdocs-eks-updatedanielgruesso2018-11-151-19/+19
* more codeblock indent correctionsdanielgruesso2018-11-151-9/+9
* fix codeblock indentationdanielgruesso2018-11-151-26/+26
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into docs-eks-updatedanielgruesso2018-11-15234-1030/+1475
|\
| * Merge branch 'frozen-string-lib-gitlab-even-more' into 'master'Stan Hu2018-11-15104-22/+237
| |\
| | * Enable even more frozen string in lib/gitlabrepo-forks/gitlab-ce-frozen-string-lib-gitlab-even-moregfyoung2018-11-13104-22/+237
| * | Merge branch 'if-53347_fix_impersonation_tokens' into 'master'Stan Hu2018-11-1514-26/+54
| |\ \
| | * | Display impersonation token value only after creationif-53347_fix_impersonation_tokensImre Farkas2018-11-1214-26/+54
| * | | Merge branch 'conditionally-build-assets-image' into 'master'Rémy Coutable2018-11-152-0/+7
| |\ \ \
| | * | | Add BUILD_ASSETS_IMAGE CI variableIan Baum2018-11-152-0/+7
| * | | | Merge branch 'gt-remove-unused-project-method' into 'master'Yorick Peterse2018-11-152-4/+5
| |\ \ \ \
| | * | | | Remove unused project methodGeorge Tsiolis2018-11-152-4/+5
| * | | | | Merge branch 'sh-bump-gitaly-version-for-ruby' into 'master'Nick Thomas2018-11-151-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Bump Gitaly version to 0.132.0sh-bump-gitaly-version-for-rubyStan Hu2018-11-141-1/+1
| | |/ / /
| * | | | Merge branch '54021-empty-button' into 'master'Phil Hughes2018-11-153-1/+7
| |\ \ \ \
| | * | | | Prevents empty button in jobs empty state54021-empty-buttonFilipa Lacerda2018-11-143-1/+7
| * | | | | Merge branch 'sh-remove-local-sidekiq-admin-check' into 'master'Nick Thomas2018-11-153-43/+5
| |\ \ \ \ \
| | * | | | | Remove display of local Sidekiq process in /admin/sidekiqStan Hu2018-11-153-43/+5
| * | | | | | Merge branch 'use-parallel-ci-keyword' into 'master'Kamil Trzciński2018-11-154-133/+24
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Use the new parallel keyword in .gitlab-ci.ymluse-parallel-ci-keywordRémy Coutable2018-11-154-133/+24
| * | | | | | Merge branch 'fix-typos' into 'master'Phil Hughes2018-11-153-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix types commentyukihir02018-11-153-3/+3
| * | | | | | Merge branch '53626-update-config-map-on-install-retry' into 'master'Kamil Trzciński2018-11-153-8/+36
| |\ \ \ \ \ \
| | * | | | | | Update config map if already present on install53626-update-config-map-on-install-retryThong Kuah2018-11-153-8/+36
| * | | | | | | Merge branch 'remove-rails5-gemfile' into 'master'Robert Speicher2018-11-151-7/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove Gemfile.rails5Jan Provaznik2018-11-151-7/+0
| * | | | | | | | Merge branch 'triggermesh-phase2-serverless' into 'master'Kamil Trzciński2018-11-155-1/+38
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add knative client to kubeclient libraryChris Baumbauer2018-11-155-1/+38
| |/ / / / / / / /
| * | | | | | | | Merge branch 'ignore-environment-validation-failure' into 'master'Kamil Trzciński2018-11-154-0/+78
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Ignore environment validation failureShinya Maeda2018-11-154-0/+78
| |/ / / / / / /
| * | | | | | | Merge branch 'osw-remove-comment-on-any-diff-line-ff' into 'master'Douwe Maan2018-11-152-28/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Remove 'comment_on_any_diff_line' feature flagosw-remove-comment-on-any-diff-line-ffOswaldo Ferreira2018-11-142-28/+1
| | |/ / / / / /
| * | | | | | | Merge branch 'osw-fallback-on-blank-refs' into 'master'Grzegorz Bizon2018-11-153-1/+28
| |\ \ \ \ \ \ \
| | * | | | | | | Avoid Gitaly RPC errors when fetching diff statsosw-fallback-on-blank-refsOswaldo Ferreira2018-11-143-1/+28
| * | | | | | | | Merge branch 'auto_devops_kubernetes_active' into 'master'Grzegorz Bizon2018-11-152-10/+21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use except:variables to fix multiple variable jobsauto_devops_kubernetes_activeThong Kuah2018-11-091-20/+16
| | * | | | | | | | Switch kubernetes:active with checking $KUBECONFIGThong Kuah2018-11-092-10/+25
| * | | | | | | | | Merge branch '53491-fix-again' into 'master'Sean McGivern2018-11-151-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Don't care about order when getting awarded issuesToon Claes2018-11-151-2/+2
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'fix-typo-in-admin-intergration' into 'master'Sean McGivern2018-11-1530-30/+30
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix a typo in Admin: intergration -> integrationfix-typo-in-admin-intergrationVincent AUBERT2018-11-1430-30/+30
| * | | | | | | | | | Merge branch 'sh-structured-logs-docs' into 'master'Sean McGivern2018-11-152-0/+145
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add missing space to logging docsh-structured-logs-docsStan Hu2018-11-141-1/+1
| | * | | | | | | | | | Exclude qa and docs from Rails 4 buildsStan Hu2018-11-141-0/+2
| | * | | | | | | | | | Add documentation on how to use structured loggingStan Hu2018-11-142-0/+145
| * | | | | | | | | | | Merge branch 'doc-pc-shortcut-webide' into 'master'Achilleas Pipinellis2018-11-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Shortcuts documentation: Add the PC equivalent of the Mac's "Cmd" key in the ...Thomas Pathier2018-11-141-1/+1
| * | | | | | | | | | | | Merge branch 'leipert-master-patch-67614' into 'master'Stan Hu2018-11-151-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update to new security report syntaxleipert-master-patch-67614Lukas Eipert2018-11-141-3/+6
| * | | | | | | | | | | | | Merge branch 'notes-consistent-key-object-case' into 'master'Filipa Lacerda2018-11-1540-695/+676
| |\ \ \ \ \ \ \ \ \ \ \ \ \