summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'deprecated-positional-spec-arguments' into 'master'Lin Jen-Shin2019-01-035-9/+14
|\
| * Fix deprecation: Using positional arguments in integration testsJasper Maes2019-01-025-9/+14
* | Merge branch '54844-report-syntax-dep-scan-ado' into 'master'Kamil Trzciński2019-01-033-1/+10
|\ \
| * | Use reports syntax for Dependency scanning jobTetiana Chupryna2019-01-033-1/+10
|/ /
* | Merge branch 'allow-basic-auth-on-go-get-middleware' into 'master'Douwe Maan2019-01-033-34/+35
|\ \
| * | Revert changesmortyccp2019-01-031-1/+1
| * | Fix lint errorsmortyccp2019-01-031-3/+3
| * | Remove authentication via warden and PRIVATE_TOKEN headermortyccp2019-01-033-77/+32
| * | Fix rspec error in rails 4mortyccp2019-01-031-0/+1
| * | Fix lint errormortyccp2019-01-031-2/+5
| * | Allow basic authentication on go get middlewaremortyccp2019-01-034-17/+59
|/ /
* | Merge branch 'patch-37' into 'master'Douwe Maan2019-01-031-1/+1
|\ \
| * | Update GITLAB_SHELL_VERSION to 8.4.4Jonathon Reinhart2019-01-021-1/+1
* | | Merge branch 'sh-bump-mini-test' into 'master'Lin Jen-Shin2019-01-032-3/+3
|\ \ \
| * | | Bump minitest to 5.11.3 to match Gitaly versionsh-bump-mini-testStan Hu2018-12-302-3/+3
* | | | Merge branch 'docs/add-requirements-for-auto-sast' into 'master'Achilleas Pipinellis2019-01-031-0/+3
|\ \ \ \
| * | | | Add requirements for Auto SASTdocs/add-requirements-for-auto-sastFabio Busatto2019-01-021-0/+3
* | | | | Merge branch '55860-use-OpenShift' into 'master'Kamil Trzciński2019-01-034-5/+5
|\ \ \ \ \
| * | | | | Use OpenShift in docs and Web UI instead of OpenshiftTakuya Noguchi2019-01-024-5/+5
* | | | | | Merge branch 'sh-make-qa-gems-consistent' into 'master'Sean McGivern2019-01-034-22/+24
|\ \ \ \ \ \
| * | | | | | Update gems in Gemfile and qa/Gemfile to be consistentStan Hu2019-01-024-22/+24
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'use-after-transition' into 'master'Grzegorz Bizon2019-01-034-2/+8
|\ \ \ \ \ \
| * | | | | | Prefer to use after_transitionuse-after-transitionKamil Trzciński2019-01-024-2/+8
* | | | | | | Merge branch '55290-docs-update-link-to-updated-prometheus-url' into 'master'Kushal Pandya2019-01-033-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix links to Prometheus Metrics LibraryTakuya Noguchi2018-12-133-3/+3
* | | | | | | | Merge branch 'docs-remove-irrelevant-sentences-in-job-artifacts-md' into 'mas...Evan Read2019-01-031-12/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Update job_artifacts.mddocs-remove-irrelevant-sentences-in-job-artifacts-mdShinya Maeda2018-12-241-12/+0
* | | | | | | | | Merge branch '55836-docs-fix-navigation-style-in-docs' into 'master'Evan Read2019-01-034-4/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix navigation style in docs55836-docs-fix-navigation-style-in-docsTakuya Noguchi2019-01-024-4/+9
* | | | | | | | | | Update CHANGELOG.md for 11.6.2GitLab Release Tools Bot2019-01-028-35/+13
* | | | | | | | | | Merge branch 'ccr/49289_milestone_link' into 'master'Mike Greiling2019-01-0220-172/+243
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add project milestone link to dashboard milestonesccr/49289_milestone_linkFatih Acet2018-12-2020-172/+243
* | | | | | | | | | | Merge branch 'deprecated-insert-sql' into 'master'Robert Speicher2019-01-022-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Fix deprecation: insert_sql is deprecated and will be removedJasper Maes2019-01-022-1/+6
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'deprecated-redirect-back' into 'master'Robert Speicher2019-01-024-3/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix deprecation: redirect_to :back is deprecatedJasper Maes2019-01-024-3/+8
|/ / / / / / / / /
* | | | | | | | | Merge branch 'mk/avoid-extra-storage-perm-and-query' into 'master'Stan Hu2019-01-025-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Avoid extra storage bucket perm and querymk/avoid-extra-storage-perm-and-queryMichael Kozono2018-12-215-5/+5
* | | | | | | | | Merge branch '55266-fix-incorrect-due-date-parsing' into 'master'Clement Ho2019-01-022-2/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add changelog entry55266-fix-incorrect-due-date-parsingKushal Pandya2018-12-271-0/+5
| * | | | | | | | | Use `parsePikadayDate` to parse due date stringKushal Pandya2018-12-271-2/+7
* | | | | | | | | | Merge branch '18667-handle-push-opts' into 'master'Douwe Maan2019-01-0213-19/+84
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add support for Git push options, specifically ci.skipJonathon Reinhart2018-12-3113-19/+84
* | | | | | | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-1-43' into 'master'Kamil Trzciński2019-01-023-4/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update GitLab Runner Helm Chart to 0.1.43update-gitlab-runner-helm-chart-to-0-1-43Tomasz Maczukin2018-12-313-4/+9
* | | | | | | | | | | | Merge branch 'blackst0ne-bump-rails-cve-2018-16476' into 'master'Grzegorz Bizon2019-01-027-44/+83
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bump Ruby on Rails to 5.0.7.1blackst0ne-bump-rails-cve-2018-16476blackst0ne2018-12-217-44/+83
* | | | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2019-01-0240-71/+470
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'security-label-xss' into 'master'John Jarvis2019-01-023-1/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Escape html entities when no label foundJarka Košanová2018-12-123-1/+28