summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix_deployment_service_predefined_variables' into 'master'Nick Thomas2019-02-114-1/+19
|\
| * Add missing argument to DeploymentService#predefined_variablesfix_deployment_service_predefined_variablesJames Fargher2019-02-084-1/+19
* | Merge branch 'deprecated-migration-inheritance' into 'master'Rémy Coutable2019-02-113-2/+7
|\ \
| * | Directly inheriting from ActiveRecord::Migration is deprecatedJasper Maes2019-02-093-2/+7
* | | Merge branch 'patch-22' into 'master'Rémy Coutable2019-02-111-1/+2
|\ \ \
| * | | use timeout as it appears in logsBen Bodenmiller2019-02-111-1/+2
|/ / /
* | | Merge branch '55447-validate-k8s-ca-cert' into 'master'Dmitriy Zaporozhets2019-02-115-3/+39
|\ \ \
| * | | Validate kubernetes cluster CA certificate55447-validate-k8s-ca-certTiger2019-02-085-3/+39
* | | | Merge branch '57431-sprockets-caches-files-independent-of-content' into 'master'Lin Jen-Shin2019-02-112-5/+3
|\ \ \ \
| * | | | Use correct integrity hash for sprockets caching57431-sprockets-caches-files-independent-of-contentLukas Eipert2019-02-082-5/+3
* | | | | Merge branch 'qa-improve-wait-for-push' into 'master'Ramya Authappan2019-02-1142-106/+348
|\ \ \ \ \
| * | | | | [CE] Improve `wait_for_push`Mark Lapierre2019-02-1142-106/+348
|/ / / / /
* | | | | Merge branch 'an-peek-jaeger' into 'master'Grzegorz Bizon2019-02-116-0/+111
|\ \ \ \ \
| * | | | | Provide a performance bar link to the Jaeger UIan-peek-jaegerAndrew Newdigate2019-02-086-0/+111
* | | | | | Merge branch 'i18n-externalize-date-picker-string' into 'master'Phil Hughes2019-02-113-2/+7
|\ \ \ \ \ \
| * | | | | | Externalize date picker stringKatrin Leinweber2019-02-103-2/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'docs-correct-word' into 'master'Evan Read2019-02-111-1/+1
|\ \ \ \ \ \
| * | | | | | Docs: correct wordMerve2019-02-091-1/+1
* | | | | | | Merge branch 'qa-staging-32-fix-create-project-spec' into 'master'Ramya Authappan2019-02-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use search_and_select instead of select_itemqa-staging-32-fix-create-project-specSanad Liaquat2019-02-081-1/+1
* | | | | | | | Merge branch 'removes-milestone-from-cluster-base-domain-docs' into 'master'Evan Read2019-02-111-4/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Removes milestone from cluster base domainremoves-milestone-from-cluster-base-domain-docsMayra Cabrera2019-02-081-4/+3
* | | | | | | | | Merge branch 'pl-copy-still-active' into 'master'Stan Hu2019-02-101-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix error when reloading code in Sidekiqpl-copy-still-activePeter Leitzen2019-02-101-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch '57428-actionview-template-error-undefined-method-for-nil-nilcla...56965-rocket-mouseover-very-sensitive-alters-flag-positioningPhil Hughes2019-02-082-2/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Improved readability of issues related MR status spec57428-actionview-template-error-undefined-method-for-nil-nilclassConstance Okoghenun2019-02-081-1/+2
| * | | | | | | | Added tests for merge_request_status partialJan Provaznik2019-02-081-0/+21
| * | | | | | | | Checking MR status date for related MR status tooltipConstance Okoghenun2019-02-081-2/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'diff-fuzzy-file-finder-feature-flag' into 'master'Filipa Lacerda2019-02-083-13/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds a feature flag to the diff fuzzy file finderPhil Hughes2019-02-083-13/+64
* | | | | | | | | Merge branch 'chart-js-updates' into 'master'Phil Hughes2019-02-088-88/+219
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Update `chart.js` to 2.7.2Andrew Fontaine2019-02-088-88/+219
|/ / / / / / / /
* | | | | | | | Merge branch 'qa-staging-33-wait-for-viewers-to-load' into 'master'Mark Lapierre2019-02-083-2/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Wait for viewers to loadqa-staging-33-wait-for-viewers-to-loadSanad Liaquat2019-02-083-2/+16
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'docs/container-registry-api-introduced' into 'master'Marcia Ramos2019-02-081-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Mention when the Registry API was introducedAchilleas Pipinellis2019-02-081-1/+3
|/ / / / / / / /
* | | | | | | | Merge branch 'mr-web-worker-origin' into 'master'Filipa Lacerda2019-02-083-10/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes diff web worker not loading in stagingPhil Hughes2019-02-083-10/+14
* | | | | | | | | Merge branch 'docs-branches-api-search' into 'master'Achilleas Pipinellis2019-02-081-5/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clarify search parameter in the branches API docsdocs-branches-api-searchLukas Eipert2019-01-301-5/+4
* | | | | | | | | | Merge branch 'patch-40' into 'master'Achilleas Pipinellis2019-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add that "developer" permissions level can create projects in a group.patch-40Caroline Wainaina2019-01-291-1/+1
* | | | | | | | | | | Merge branch 'patch-41' into 'master'Achilleas Pipinellis2019-02-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add link to API for GitHub importspatch-41Blair Lunceford2019-01-301-0/+1
* | | | | | | | | | | | Merge branch 'winh-draft_note_spec-vue-test-utils' into 'master'Phil Hughes2019-02-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Refactor draft_note_spec.js to Vue test utils (CE backport)Winnie Hellmann2019-02-081-0/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs/fix-anchor-link' into 'master'Achilleas Pipinellis2019-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixes link to wrong sectiondocs/fix-anchor-linkEvan Read2019-01-311-1/+1
* | | | | | | | | | | | Merge branch 'docs/uplift-broadcast-messages-api-doc' into 'master'Achilleas Pipinellis2019-02-082-35/+68
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Refactor broadcast message API pagedocs/uplift-broadcast-messages-api-docEvan Read2019-02-052-35/+68