summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Minor improvements to CI_API_V4_URL variable exposurefeature/gb/expose-ci-api-url-variableGrzegorz Bizon2019-01-033-3/+3
|
* Add new docs for CI_API_V4_URL CI/CD variableGrzegorz Bizon2019-01-031-1/+2
|
* Add changelog for new predefined CI/CD variableGrzegorz Bizon2019-01-031-0/+5
|
* Expose CI_API_V4_URL predefined CI/CD variableGrzegorz Bizon2019-01-032-1/+2
|
* Add API::Helpers::Version and expose API root URLGrzegorz Bizon2019-01-036-25/+88
| | | | | This commits adds a new class that is supposed to represent Grape API version, like `v3` or `v4`.
* Expose method that returns GitLab API pathsGrzegorz Bizon2019-01-032-0/+44
|
* Merge branch 'patch-37' into 'master'Douwe Maan2019-01-031-1/+1
|\ | | | | | | | | Update GITLAB_SHELL_VERSION to 8.4.4 See merge request gitlab-org/gitlab-ce!24106
| * Update GITLAB_SHELL_VERSION to 8.4.4Jonathon Reinhart2019-01-021-1/+1
| | | | | | | | | | | | Pass push options along to gitlab-rails's post-receive endpoint See https://gitlab.com/gitlab-org/gitlab-shell/blob/master/CHANGELOG
* | Merge branch 'sh-bump-mini-test' into 'master'Lin Jen-Shin2019-01-032-3/+3
|\ \ | | | | | | | | | | | | Bump minitest to 5.11.3 to match Gitaly version See merge request gitlab-org/gitlab-ce!24070
| * | Bump minitest to 5.11.3 to match Gitaly versionsh-bump-mini-testStan Hu2018-12-302-3/+3
| | | | | | | | | | | | This prevents us from shipping duplicate versions of this gem.
* | | Merge branch 'docs/add-requirements-for-auto-sast' into 'master'Achilleas Pipinellis2019-01-031-0/+3
|\ \ \ | | | | | | | | | | | | | | | | Add requirements for Auto SAST See merge request gitlab-org/gitlab-ce!24104
| * | | 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 Openshift Closes #55860 See merge request gitlab-org/gitlab-ce!24097
| * | | | Use OpenShift in docs and Web UI instead of OpenshiftTakuya Noguchi2019-01-024-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | Merge branch 'sh-make-qa-gems-consistent' into 'master'Sean McGivern2019-01-034-22/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update gems in Gemfile and qa/Gemfile to be consistent See merge request gitlab-org/gitlab-ce!24112
| * | | | | Update gems in Gemfile and qa/Gemfile to be consistentStan Hu2019-01-024-22/+24
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow developers to run `bundle install` on both directories and avoid additional calls to RubyGems for local development. Also sets up the possibility of improved caching as mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/55843.
* | | | | Merge branch 'use-after-transition' into 'master'Grzegorz Bizon2019-01-034-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer to use after_transition Closes #55306 See merge request gitlab-org/gitlab-ce!24107
| * | | | | Prefer to use after_transitionuse-after-transitionKamil Trzciński2019-01-024-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before_transition does not play nice when used with OptimisticLocking and this can result in triggering multiple events Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55306
* | | | | | Merge branch '55290-docs-update-link-to-updated-prometheus-url' into 'master'Kushal Pandya2019-01-033-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: Fix links to Prometheus Metrics Library Closes #55290 See merge request gitlab-org/gitlab-ce!23790
| * | | | | | Fix links to Prometheus Metrics LibraryTakuya Noguchi2018-12-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | Merge branch 'docs-remove-irrelevant-sentences-in-job-artifacts-md' into ↵Evan Read2019-01-031-12/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove outdated sentences from job_artifacts.md See merge request gitlab-org/gitlab-ce!24013
| * | | | | | | 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 docs Closes #55836 See merge request gitlab-org/gitlab-ce!24090
| * | | | | | | | Fix navigation style in docs55836-docs-fix-navigation-style-in-docsTakuya Noguchi2019-01-024-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | Update CHANGELOG.md for 11.6.2GitLab Release Tools Bot2019-01-028-35/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'ccr/49289_milestone_link' into 'master'Mike Greiling2019-01-0220-172/+243
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project milestone link Closes #49289 See merge request gitlab-org/gitlab-ce!22552
| * | | | | | | | | Add project milestone link to dashboard milestonesccr/49289_milestone_linkFatih Acet2018-12-2020-172/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the steps to deprecate dashboard milestones. Links do dashboard milestone are replaced with links for each project milestone
* | | | | | | | | | Merge branch 'deprecated-insert-sql' into 'master'Robert Speicher2019-01-022-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deprecation: insert_sql is deprecated and will be removed See merge request gitlab-org/gitlab-ce!23944
| * | | | | | | | | | 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 deprecated See merge request gitlab-org/gitlab-ce!23943
| * | | | | | | | | 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 query See merge request gitlab-org/gitlab-ce!23995
| * | | | | | | | Avoid extra storage bucket perm and querymk/avoid-extra-storage-perm-and-queryMichael Kozono2018-12-215-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, the `ListAllMyBuckets` permission. This works if you know the directory exists. See more: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23981 * https://stackoverflow.com/a/12288581/1992201
* | | | | | | | | Merge branch '55266-fix-incorrect-due-date-parsing' into 'master'Clement Ho2019-01-022-2/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `parsePikadayDate` to parse due date string Closes #55266 See merge request gitlab-org/gitlab-ce!24045
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle 'git push -o ci.skip' Closes #18667 See merge request gitlab-org/gitlab-ce!15643
| * | | | | | | | | | Add support for Git push options, specifically ci.skipJonathon Reinhart2018-12-3113-19/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-org/gitlab-shell!166 added support for collecting push options from the environment, and passing them along to the /internal/post_receive API endpoint. This change handles the new push_options JSON element in the payload, and passes them on through to the GitPushService and GitTagPushService services. Futhermore, it adds support for the first push option, ci.skip. With this change, one can use 'git push -o ci.skip' to skip CI pipe execution. Note that the pipeline is still created, but in the "skipped" state, just like with the 'ci skip' commit message text. Implements #18667
* | | | | | | | | | | 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.43 See merge request gitlab-org/gitlab-ce!24083
| * | | | | | | | | | | 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.1 See merge request gitlab-org/gitlab-ce!23396
| * | | | | | | | | | | | Bump Ruby on Rails to 5.0.7.1blackst0ne-bump-rails-cve-2018-16476blackst0ne2018-12-217-44/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the CVE-2018-16476 vulnerability.
* | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Escape html entities when no label found See merge request gitlab/gitlabhq!2706
| | * | | | | | | | | | | | | Escape html entities when no label foundJarka Košanová2018-12-123-1/+28
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'security-master-secret-ci-variables-exposed' into 'master'John Jarvis2019-01-0220-44/+372
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Secret CI variables can exposed by creating a tag with the same name as an existing protected branch See merge request gitlab/gitlabhq!2596
| | * | | | | | | | | | | | | | Add CHANGELOG entryMatija Čupić2018-12-081-0/+5
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Use full ref when creating MR pipeline in specsMatija Čupić2018-12-081-6/+6
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Use build for testing HasRefMatija Čupić2018-12-081-8/+8
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Support merge_request pipeline ref typesMatija Čupić2018-12-081-7/+3
| | | | | | | | | | | | | | | |