summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Only validate project visibility when it has changedsh-skip-validation-visibility-changedStan Hu2019-01-031-0/+25
| | | | | | | | | | | | On GitLab.com, there are hundreds of projects that have visibility levels that are inconsistent with the fork or group settings. Most likely, this happened during a GitLab project import because the validation was bypassed. Attempting to migrate these projects to hashed storage fails even though the migration doesn't touch the visibility settings. Skipping the visibility validation allows the migration to go through. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55881
* Merge branch '27861-add-markdown-editing-buttons-to-the-file-editor' into ↵Fatih Acet2019-01-032-163/+237
|\ | | | | | | | | | | | | | | | | 'master' Resolve "Add markdown editing buttons to the file editor" Closes #27861 See merge request gitlab-org/gitlab-ce!23480
| * Add markdown buttons to file editor27861-add-markdown-editing-buttons-to-the-file-editorSam Bigelow2019-01-022-163/+237
| | | | | | | | | | | | | | Currently, we have markdown files in many places (e.g. comments, new issues, etc.). This Merge Request detects if the file being edited is a markdown file and adds markdown buttons and their functionality to the single file editor (Not the web IDE)
* | Add Knative metrics to PrometheusChris Baumbauer2019-01-033-0/+33
| |
* | Merge branch 'tz-user-popover-follow-up' into 'master'Clement Ho2019-01-032-11/+9
|\ \ | | | | | | | | | | | | Added Comment to user avatar Image, Changed Fixtures to created ones, added shadow color See merge request gitlab-org/gitlab-ce!23768
| * | Comment user avatar Image, Changed Fixtures, added new shadow colortz-user-popover-follow-upTim Zallmann2018-12-122-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | Needed to reorder css variables Neede to reorder vars again Added Changelog
* | | Merge branch 'ce-1979-fe-settings-empty' into 'master'Kushal Pandya2019-01-031-22/+43
|\ \ \ | | | | | | | | | | | | | | | | CE Port of "(Part 1) FE multiple approval rules settings - empty state" See merge request gitlab-org/gitlab-ce!24087
| * | | Update callout component to receive slotce-1979-fe-settings-emptyPaul Slaughter2019-01-021-22/+43
| | | | | | | | | | | | | | | | | | | | **Why?** - This is needed to add buttons to the callout
* | | | Merge branch 'deprecated-positional-spec-arguments' into 'master'Lin Jen-Shin2019-01-034-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix deprecation: Using positional arguments in integration tests See merge request gitlab-org/gitlab-ce!24110
| * | | | Fix deprecation: Using positional arguments in integration testsJasper Maes2019-01-024-9/+9
| | | | |
* | | | | Fix lint errorsmortyccp2019-01-031-3/+3
| | | | |
* | | | | Remove authentication via warden and PRIVATE_TOKEN headermortyccp2019-01-031-46/+18
| | | | |
* | | | | Fix rspec error in rails 4mortyccp2019-01-031-0/+1
| | | | |
* | | | | Allow basic authentication on go get middlewaremortyccp2019-01-031-0/+20
| | | | |
* | | | | Merge branch 'ccr/49289_milestone_link' into 'master'Mike Greiling2019-01-026-45/+111
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 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-206-45/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the steps to deprecate dashboard milestones. Links do dashboard milestone are replaced with links for each project milestone
* | | | | Merge branch 'mk/avoid-extra-storage-perm-and-query' into 'master'Stan Hu2019-01-024-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-214-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '18667-handle-push-opts' into 'master'Douwe Maan2019-01-022-4/+28
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-312-4/+28
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-311-3/+3
| |/ / / /
* | | | | Merge branch 'blackst0ne-bump-rails-cve-2018-16476' into 'master'Grzegorz Bizon2019-01-021-3/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-211-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | Fix the CVE-2018-16476 vulnerability.
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2019-01-0218-36/+345
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'security-label-xss' into 'master'John Jarvis2019-01-021-0/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-121-0/+18
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'security-master-secret-ci-variables-exposed' into 'master'John Jarvis2019-01-0211-27/+301
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| | * | | | | | 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
| | | | | | | |
| | * | | | | | Check for explicit true or false in specsMatija Čupić2018-12-081-6/+22
| | | | | | | |
| | * | | | | | 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-081-1/+21
| | | | | | | |
| | * | | | | | Remove resolving conditional from protected_forMatija Čupić2018-12-081-0/+22
| | | | | | | |
| | * | | | | | Raise an error on ambiguous refsMatija Čupić2018-12-081-2/+2
| | | | | | | |
| | * | | | | | Rename Repository#resolve_ref to expand_refMatija Čupić2018-12-081-5/+5
| | | | | | | |
| | * | | | | | Implement Command#ambiguous_ref?Matija Čupić2018-12-081-0/+20
| | | | | | | |
| | * | | | | | Implement Repository#ambiguous_ref?Matija Čupić2018-12-082-34/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements Repository#ambiguous_ref? and checks if a ref is ambiguous before trying to resolve the ref in Project#protected_for?
| | * | | | | | Move Project#resolve_ref to RepositoryMatija Čupić2018-12-082-50/+48
| | | | | | | |
| | * | | | | | Remove Repository#find_refMatija Čupić2018-12-081-36/+0
| | | | | | | |
| | * | | | | | Use strings instead of Gitlab::Git::RefMatija Čupić2018-12-081-28/+10
| | | | | | | |
| | * | | | | | Remove Gitlab::Git::Ref#full_refMatija Čupić2018-12-082-25/+0
| | | | | | | |
| | * | | | | | Check for Tag/Branch corectnessMatija Čupić2018-12-082-5/+21
| | | | | | | |
| | * | | | | | Reintroduce Command#protected_ref?Matija Čupić2018-12-083-2/+26
| | | | | | | |
| | * | | | | | Use nil instead of raising AmbiguousRefMatija Čupić2018-12-081-2/+10
| | | | | | | |
| | * | | | | | Use Gitlab::Git::Ref in Project#resolve_refMatija Čupić2018-12-084-23/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworks Project#resolve_ref to return Gitlab::Git::Branch, Gitlab::Git::Tag or raise an AmbiguousRef error.
| | * | | | | | Avoid using magic variable in specMatija Čupić2018-12-081-3/+3
| | | | | | | |
| | * | | | | | Make HasRef#git_ref publicMatija Čupić2018-12-081-0/+28
| | | | | | | |
| | * | | | | | Prevent creating pipelines with ambiguous refsMatija Čupić2018-12-083-22/+23
| | | | | | | |
| | * | | | | | Use full ref when possible to avoid ambiguityMatija Čupić2018-12-083-4/+43
| | | | | | | |