Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-04-19Merge branch 'fix/orphan-notification-settings' into 'master'Yorick Peterse
Fix orphaned notification settings Closes #29688 See merge request !10763
2017-04-05Merge branch '29364-private-projects-mr-fix' into 'security' Sean McGivern
Don’t show source project name when user does not have access See merge request !2081
2017-04-04Merge branch 'sh-fix-destroy-user-race' into 'master' Douwe Maan
Fix race condition where a namespace would be deleted before a project was deleted Closes #30334 and #30306 See merge request !10389
2017-03-29Merge branch 'jej-group-name-disclosure' into 'security' Sean McGivern
Prevent private group disclosure via parent_id See merge request !2077
2017-03-28Merge branch 'fix/gb/pipeline-retry-only-latest-jobs' into 'master' Kamil Trzciński
Do not retry jobs multiple times when retrying a pipeline Closes #30092 See merge request !10249
2017-03-21Merge branch 'create-branch-service-create-file' into 'master' Sean McGivern
Fix CreateBranchService after Repository#commit_file was renamed to create_file Closes #29687 See merge request !10081
2017-03-20Merge branch '9-0-stable' into 9-0-stable-devLin Jen-Shin
* 9-0-stable: Merge branch 'protobuf-3.2.0.2' into 'master' Merge branch '28890-allow-creating-mr-without-target-branch-in-url' into 'master' Merge branch '24683-sidebar-spinners' into 'master' Merge branch '29534-todos-performance' into 'master' Merge branch '29586-pipelines-tabs' into 'master' Merge branch 'fix/regressions-in-ci-v4-api' into 'master'
2017-03-20Merge branch '28890-allow-creating-mr-without-target-branch-in-url' into ↵Sean McGivern
'master' Allow creating merge request even if target branch is not specified in query params Closes #28890 See merge request !9968
2017-03-18Merge branch 'ssrf' into 'security' Douwe Maan
Protect server against SSRF in project import URLs See merge request !2068
2017-03-18Merge branch 'all-ci-offline-migrations' into 'master' Robert Speicher
All CI offline migrations See merge request !9730
2017-03-16Merge branch 'zj-rename-ci-vars' into 'master' Achilleas Pipinellis
Futher rename the CI variables See merge request !9851
2017-03-16Preserve order by priority on issues boardValery Sizov
2017-03-16Merge branch '8836-mr-revert' into 'master' Robert Speicher
Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master' See merge request !9974
2017-03-08Fix transient failure in TodoService specRobert Speicher
For reasons unknown, the lack of `and_call_original` on this message expectation was causing a transient failure depending on test order. We narrowed it down using `rspec --bisect` to the following order: spec/requests/openid_connect_spec.rb:123 spec/services/todo_service_spec.rb:751
2017-03-08Merge branch 'master' into orderable-issuesDouwe Maan
2017-03-07[Issue Board Sorting] More accurate move through the listValery Sizov
2017-03-07Merge branch 'feature/runner-jobs-v4-api' into 'master' Kamil Trzciński
Feature/runner jobs v4 api Closes #28513 See merge request !9273
2017-03-07Moved call of SystemHooksService from UpdateMergeRequestsWorker to ↵gpongelli
GitPushServic…
2017-03-07Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov
2017-03-07Address review commentsValery Sizov
2017-03-07Merge branch 'master' into 'rs-carrierwave-db'Douwe Maan
# Conflicts: # spec/models/group_spec.rb
2017-03-06Merge branch 'zj-create-mattermost-team' into 'master' Kamil Trzciński
Create Mattermost Team from GitLab Closes #23964 See merge request !8746
2017-03-06Fix Projects::UploadService specRobert Speicher
For reasons unknown, this spec was passing a project's repository as the first argument to `Projects::UploadService`, while it was expecting the project itself. Previously this wasn't a problem because `FileUploader` only needed the object to respond to `path_with_namespace`, which Repository and Project both did. But now because of `Upload` and its polymorphic association, it expects the object to respond to `primary_key`.
2017-03-06Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov
2017-03-06Addressing review commentsValery Sizov
2017-03-06Merge branch 'master' into pipeline-blocking-actionsGrzegorz Bizon
* master: (26 commits) Fix UserBasic Rename `/take` to `/take_ownership`, expose `owner` in `v3`. Update after review Fix values being called at Array instead of Hash Fix json response in branches controller Improve docs and specs related to pages artifacts Add MR fo changelog about removing pages artifacts Delete artifacts for pages unless expiry date is specified Lint doc Improved team selection Move foreign key to separate migration Fix import model attributes Update documentation and expose ID Introduce tests for pipeline triggers Fix trigger model Update db/schema Make triggers to be user aware Make Pipeline Triggers to be user aware Update triggers API Remove remnants of git annex ... Conflicts: db/schema.rb
2017-03-06Merge branch 'master' into 'zj-create-mattermost-team'Zeger-Jan van de Weg
# Conflicts: # db/schema.rb
2017-03-06Merge branch 'introduce-pipeline-triggers' into 'master' Sean McGivern
Improve pipeline triggers API See merge request !9713
2017-03-06Extend pipeline retry specs with blocking actionsGrzegorz Bizon
2017-03-06Add specs for new pipeline and build action eventsGrzegorz Bizon
2017-03-06Fix spec for Ci::RegisterJobServiceTomasz Maczukin
2017-03-06Extend specs for pipelines with manual blocking actionsGrzegorz Bizon
2017-03-06Adjust pipeline retry specs to use manual statusesGrzegorz Bizon
2017-03-06Always actionize build when it is a manual actionGrzegorz Bizon
Do not skip manual actions even if actions are optional.
2017-03-06Fix Rubocop offenses in pipeline processing specsGrzegorz Bizon
2017-03-06Reinstitute a core `manual` status for manual actionsGrzegorz Bizon
2017-03-06Add support for blocking actions to CI/CD pipelineGrzegorz Bizon
2017-03-06Make pipeline processing specs more consistentGrzegorz Bizon
2017-03-06Fix pipeline retry specs for optional blocking actionsGrzegorz Bizon
2017-03-06Fix specs for pipeline processing with manual actionsGrzegorz Bizon
2017-03-06Remove duplication in process pipeline service specsGrzegorz Bizon
This will make it easier to extend this spec file to add new test examples covering blocking manual actions.
2017-03-06Refactor code related to pipeline blocking actionsGrzegorz Bizon
2017-03-06Improve docs and specs related to pages artifactsGrzegorz Bizon
2017-03-06Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg
2017-03-06Delete artifacts for pages unless expiry date is specifiedKamil Trzcinski
2017-03-05Make triggers to be user awareKamil Trzcinski
2017-03-03Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov
2017-03-03[Issue sorting on board] Addressing review issuesValery Sizov
2017-03-03Merge branch 'revert_disallow_system_notes_for_closed_issuables' into 'master' Sean McGivern
Revert "Disallow system notes for closed issuables" Closes #28207 See merge request !9673
2017-03-03Merge branch 'fix/gb/fix-build-retry-tags-assignment' into 'master' Kamil Trzciński
Fix runner tags assignment when retrying a job Closes #28846 See merge request !9612