summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add a comment on `Ci::Pipeline#git_ref` about merge request refadd-a-comment-on-ci-pipeline-git_ref-about-merge-request-refShinya Maeda2019-01-031-0/+6
|
* 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
| | | | | | | | | | | | |
| | * | | | | | | | | | | Check resolved_ref before checking if protectedMatija Čupić2018-12-081-1/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Check for explicit true or false in specsMatija Čupić2018-12-081-6/+22
| | | | | | | | | | | | |
| | * | | | | | | | | | | Conditionally assign ref_name for more efficiencyMatija Čupić2018-12-081-1/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | Refactor Project#protected_for? specsMatija Čupić2018-12-081-51/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the Project#protected_for? specs to separate them into two contexts: when the ref is a full ref and when the ref is a ref name.
| | * | | | | | | | | | | Add specs when full ref is passed to protected_forMatija Čupić2018-12-082-2/+22
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove resolving conditional from protected_forMatija Čupić2018-12-082-7/+24
| | | | | | | | | | | | |
| | * | | | | | | | | | | Raise an error on ambiguous refsMatija Čupić2018-12-083-3/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | Rename Repository#resolve_ref to expand_refMatija Čupić2018-12-083-14/+13
| | | | | | | | | | | | |
| | * | | | | | | | | | | Make full ref in Repository#resolve_ref explicitMatija Čupić2018-12-081-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Implement Command#ambiguous_ref?Matija Čupić2018-12-083-1/+27
| | | | | | | | | | | | |
| | * | | | | | | | | | | Simplify conditionals in Project#protected_ref?Matija Čupić2018-12-081-2/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | Revert "Use to_s.start_with? in tag/branch ref method"Matija Čupić2018-12-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec4730478b798270781257913ee4cede673d4d4e.
| | * | | | | | | | | | | Implement Repository#ambiguous_ref?Matija Čupić2018-12-085-45/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements Repository#ambiguous_ref? and checks if a ref is ambiguous before trying to resolve the ref in Project#protected_for?
| | * | | | | | | | | | | Use to_s.start_with? in tag/branch ref methodMatija Čupić2018-12-081-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Move Project#resolve_ref to RepositoryMatija Čupić2018-12-085-67/+65
| | | | | | | | | | | | |
| | * | | | | | | | | | | Search for tag / branch ref from beginningMatija Čupić2018-12-081-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove Repository#find_refMatija Čupić2018-12-082-46/+0
| | | | | | | | | | | | |
View Lorry Controller Status