summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Instruct against squashing in CE to EE MRsdocs/ce-to-ee-no-squashAchilleas Pipinellis2018-11-231-0/+3
* Merge branch 'docs-update-perfbar-path' into 'master'Achilleas Pipinellis2018-11-231-2/+2
|\
| * update path to performance bar in admin settingsdocs-update-perfbar-pathAlexander Tanayno2018-11-231-2/+2
* | Merge branch 'docs-update-request-prof-screenshot' into 'master'Achilleas Pipinellis2018-11-231-0/+0
|\ \
| * | update screenshot for request profiling tokendocs-update-request-prof-screenshotAlexander Tanayno2018-11-231-0/+0
| |/
* | Merge branch 'remove-research-template' into 'master'Phil Hughes2018-11-231-17/+0
|\ \
| * | Delete Research proposal.mdremove-research-templateSarah O'Donnell2018-11-231-17/+0
* | | Merge branch 'sh-register-ci-job-service-improve' into 'master'Kamil Trzciński2018-11-231-4/+2
|\ \ \
| * | | Clean up fix for RegisterJobServicesh-register-ci-job-service-improveStan Hu2018-11-221-4/+2
* | | | Merge branch '53326-improve-issues-empty-state' into 'master'Sean McGivern2018-11-237-15/+58
|\ \ \ \ | |_|/ / |/| | |
| * | | Update empty state messageHeinrich Lee Yu2018-11-195-7/+7
| * | | Refactor to use updated params in finderHeinrich Lee Yu2018-11-192-15/+4
| * | | Apply to MRsHeinrich Lee Yu2018-11-194-15/+23
| * | | DRY up testsHeinrich Lee Yu2018-11-191-16/+13
| * | | Remove text-center in descriptionHeinrich Lee Yu2018-11-191-1/+1
| * | | Add changelog entryHeinrich Lee Yu2018-11-191-0/+5
| * | | Show separate empty_state if issues are filteredHeinrich Lee Yu2018-11-194-1/+45
* | | | Merge branch 'jprovazn-locale-fix' into 'master'Grzegorz Bizon2018-11-232-4/+6
|\ \ \ \
| * | | | Explicitly set locale fallbacksjprovazn-locale-fixJan Provaznik2018-11-212-4/+6
* | | | | Merge branch 'rails5-deprecation-render-nothing' into 'master'Rémy Coutable2018-11-236-9/+15
|\ \ \ \ \
| * | | | | render :nothing option is deprecated, Use head method to respond with empty r...Jasper Maes2018-11-236-9/+15
| | |_|/ / | |/| | |
* | | | | Merge branch '54391-tag' into 'master'Phil Hughes2018-11-232-1/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Correctly styles tags in jobs sidebarFilipa Lacerda2018-11-232-1/+6
|/ / / /
* | | | Merge branch '_acet-fix-unable-to-reply-resolved-nondiff-discussion' into 'ma...Phil Hughes2018-11-233-3/+56
|\ \ \ \
| * | | | Allow commenting to resolved non-diff discussions_acet-fix-unable-to-reply-resolved-nondiff-discussionFatih Acet2018-11-223-3/+56
* | | | | Merge branch 'ce-backport-3777-promote-to-epic' into 'master'Rémy Coutable2018-11-232-3/+27
|\ \ \ \ \
| * | | | | Add support for custom highlighting slash commands via warning flagsce-backport-3777-promote-to-epicKushal Pandya2018-11-212-3/+27
* | | | | | Merge branch 'rails5-env-deprecated' into 'master'Sean McGivern2018-11-233-2/+7
|\ \ \ \ \ \
| * | | | | | Rails5: env is deprecated and will be removed from Rails 5.1Jasper Maes2018-11-153-2/+7
* | | | | | | Merge branch 'dm-batch-loader-sidekiq' into 'master'Stan Hu2018-11-223-0/+19
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Clear BatchLoader context between Sidekiq jobsDouwe Maan2018-11-223-0/+19
* | | | | | | Merge branch 'update-gitlab-runner-helm-chart-version' into 'master'Kamil Trzciński2018-11-223-4/+9
|\ \ \ \ \ \ \
| * | | | | | | Add CHANGELOG entryupdate-gitlab-runner-helm-chart-versionTomasz Maczukin2018-11-221-0/+5
| * | | | | | | Update used version of Runner Helm Chart to 0.1.38Tomasz Maczukin2018-11-222-4/+4
* | | | | | | | Merge branch 'gt-include-wildcard-for-gitlab-assets-compile-only-parameter' i...Rémy Coutable2018-11-221-4/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Include wildcard for `gitlab:assets:compile` only parameterGeorge Tsiolis2018-11-221-4/+4
| |/ / / / / /
* | | | | | | Merge branch 'patch-32' into 'master'Stan Hu2018-11-221-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Correct blocked SMTP ports for GKEMax Winterstein2018-11-211-2/+1
* | | | | | | | Merge branch '48534-autocomplete-spec' into 'master'Kamil Trzciński2018-11-221-7/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Add specs for entities autocompleteJarka Košanová2018-11-221-7/+47
* | | | | | | | | Merge branch '349-qa-add-params-for-qa-variables' into 'master'Rémy Coutable2018-11-223-2/+10
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | More env vars for group & project names in QADylan Griffith2018-11-223-2/+10
* | | | | | | | | Merge branch 'mr-sticky-headers' into 'master'Filipa Lacerda2018-11-223-0/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Made diff file headers stickyPhil Hughes2018-11-223-0/+31
* | | | | | | | | | Merge branch 'jprovazn-versioned-migrations' into 'master'Rémy Coutable2018-11-221067-1067/+1086
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add version 4.2 to all existing migrationsjprovazn-versioned-migrationsJan Provaznik2018-11-221062-1064/+1064
| * | | | | | | | | | Update generator templatesJan Provaznik2018-11-223-3/+3
| * | | | | | | | | | Add version migration support to rails 4Jan Provaznik2018-11-222-0/+19
* | | | | | | | | | | Merge branch 'mr-file-tree-commit' into 'master'Filipa Lacerda2018-11-2210-107/+58
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Show toggle tree button on merge request commitsPhil Hughes2018-11-2210-107/+58
| |/ / / / / / / / / /