summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Om nom nom57322-eat-pagesNick Thomas2019-02-113-0/+64
* Merge branch 'bvl-port-translations-from-ee' into 'master'Rémy Coutable2019-02-1142-15302/+141195
|\
| * Merge branch 'master-i18n' into 'master'Rémy Coutable2019-02-1142-15302/+141195
* | Merge branch 'docs-profile-html-output-example' into 'master'Marcia Ramos2019-02-111-0/+10
|\ \
| * | Add HTML output example to profilingDrew Blessing2019-02-111-0/+10
|/ /
* | Merge branch 'docs/pages-compress' into 'master'Marcia Ramos2019-02-111-2/+2
|\ \
| * | Change find flags to also work with AlpineAchilleas Pipinellis2019-02-111-2/+2
|/ /
* | Merge branch '57450-follow-up-from-api-group-labels' into 'master'Achilleas Pipinellis2019-02-111-8/+8
|\ \
| * | Improve group labels API docs57450-follow-up-from-api-group-labelsRobert Schilling2019-02-101-8/+8
* | | Merge branch 'docs/refactor-update-guides' into 'master'Marin Jankovski2019-02-1186-17385/+709
|\ \ \
| * | | Use a single document for upgrading from CE to EEYorick Peterse2019-02-112-5/+137
| * | | Refactor the upgrading from source docsdocs/refactor-update-guidesYorick Peterse2019-02-1185-17380/+572
| | |/ | |/|
* | | Merge branch 'docs-abuango-registry-selfsigned-certs' into 'master'Tom Atkins2019-02-111-6/+14
|\ \ \
| * | | Update container_registry.md add Troubleshooting sectionsTom Atkins2019-02-111-5/+6
| * | | Update on using self-signed certs with registrydocs-abuango-registry-selfsigned-certsAbubakar Siddiq Ango2019-02-111-3/+10
* | | | Merge branch 'docs-57480-fix-branch-api-table-format' into 'master'Achilleas Pipinellis2019-02-111-0/+1
|\ \ \ \
| * | | | Fix branch API table formatMark Fletcher2019-02-111-0/+1
* | | | | Merge branch '52424-goodbye-hipchat' into 'master'Douglas Barbosa Alexandre2019-02-1128-952/+53
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove HipChat integration from GitLabNick Thomas2019-02-0828-952/+53
* | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
View Lorry Controller Status