summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Speed up setting of relative positionspeed-up-relative-positioningSean McGivern2018-11-234-14/+49
* 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
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'gt-limit-gitlab-assets-compile-job-to-branches' into 'master'Rémy Coutable2018-11-221-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Limit `gitlab:assets:compile` job to branchesGeorge Tsiolis2018-11-221-0/+5
* | | | | | | | | | | Merge branch 'fix-typos-occured' into 'master'Kushal Pandya2018-11-2214-55/+55
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update gitlab.potHiroyuki Sato2018-11-211-32/+32
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into fix-typos-occuredHiroyuki Sato2018-11-211161-8147/+7900
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix typos occured to occurredHiroyuki Sato2018-11-1614-25/+25
* | | | | | | | | | | | Merge branch '54293-fetch-assets-job-times-out-so-package-and-qa-jobs-can-t-c...Rémy Coutable2018-11-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Pass GITLAB_REF_SLUG to the Omnibus triggers54293-fetch-assets-job-times-out-so-package-and-qa-jobs-can-t-completeRémy Coutable2018-11-221-0/+1
* | | | | | | | | | | | Merge branch 'docs/fix-shibboleth-markdown' into 'master'Achilleas Pipinellis2018-11-221-85/+85
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix markdown to render correctlydocs/fix-shibboleth-markdownEvan Read2018-11-201-85/+85
* | | | | | | | | | | | | Merge branch 'docs/delete-broken-link' into 'master'Achilleas Pipinellis2018-11-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove broken link that 404s and has no alternativedocs/delete-broken-linkEvan Read2018-11-221-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '46950-systemcheck-use-gem-ruby-instead-of-hardcoding-ruby-versi...Douwe Maan2018-11-222-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use a more reliable way to detect current Ruby version46950-systemcheck-use-gem-ruby-instead-of-hardcoding-ruby-version46950-systemcheck-ruby-versionGabriel Mazetto2018-11-212-1/+6
* | | | | | | | | | | | | Merge branch 'revert-fd6e3781' into 'master'Sean McGivern2018-11-2219-1281/+785
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix bug where ID is not setrevert-fd6e3781Zeger-Jan van de Weg2018-11-203-6/+29