CE upstream
@ayufan Please resolve conflicts:
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by them: app/services/create_commit_builds_service.rb
both modified: app/services/git_push_service.rb
both modified: app/services/git_tag_push_service.rb
both modified: spec/models/ci/pipeline_spec.rb
both modified: spec/requests/ci/api/builds_spec.rb
@ayufan Assigned to you since you are the author https://gitlab.com/gitlab-org/gitlab-ce/commit/39203f1adfc6fee3eca50f0cab99ffc597865200
Merge request reports
Activity
Added 1 commit:
- 26d9d312 - Resolve merge conflicts
Added 6 commits:
-
95028cb2...e44bc0a0 - 5 commits from branch
master
- 5854c47c - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream
-
95028cb2...e44bc0a0 - 5 commits from branch
#> ruby spec/models/ci/pipeline_spec.rb spec/models/ci/pipeline_spec.rb:257: syntax error, unexpected end-of-input, expecting keyword_end
Edited by Valery Sizov
cc @jacobvosmaer-gitlab I hope it's a proper fix.
@vsizov +1 thanks for fixing
Added 47 commits:
- e3c12332 - remove need for schedules
- 416be9bf - edit
- ace19ec5 - Style deploy button
- 415921a7 - Add avatar to commit message; environment style updates to match pipelines page
- 60a34722 - Format environment history page
- 0a15ad31 - Add deployment ID and gravatar to environments page
- f6c0c96b - Add gravatars to build history
- 7d65d2ec - Corrected links/usernames in performance guide
- c2a1011f - Remove unused SpamReport model; this was renamed to SpamLog
- 32b579e8 - Show member roles to all users on members page
- 6109daf4 - api for generating new merge request
- ded60291 - Merge branch '20614-show-member-roles-to-all-users' into 'master'
- 790dd898 - Default build tests ruby 2.3.1
- 39103b14 - Update docs to reference Ruby 2.3.1
- 100df6c3 - Update gitlab ci tests to test ruby 2.1 now too
- 9f9e38ff - Update currently supported Ruby version info.
- 3b973d18 - Target 8.11 for CHANGELOG entry Ruby 2.3
- 55d0442e - Merge branch 'remove-schedules' into 'master'
- d983c5bd - Verify the pipeline status after executing events on builds
- cbafc9ef - Merge branch 'ruby-2-3-lets-not-break-things' into 'master'
- b9b1910c - Merge branch 'feature/merge-request-link-after-push' into 'master'
- 97ef1ee3 - Update gitlab-shell to v3.3.3
- 954918d4 - Upgrade Rails to 4.2.7.1 for security fixes.
- 4f7a6615 - Merge branch 'rails-4-2-7-1' into 'master'
- ded2b367 - Merge branch 'gitlab-shell-3-3-3' into 'master'
- 6a6a69f4 - Use state machine for pipeline event processing
-
4ccf39cd - Fix test failures, that did occur because of missing previously used
reload_status!
call - 957632b7 - render only commit title
- c5aca8b2 - Update CHANGELOG
- d4f987b2 - Merge branch '19725-new-pipeline-auto-completion' into 'master'
- 1984697b - Merge remote-tracking branch 'origin/master' into improve-pipeline-processing
- 8acbc9e0 - Merge remote-tracking branch 'origin/master' into improve-pipeline-processing
- 0f6ed843 - Merge branch 'remove-unused-spam-report' into 'master'
- e1f05b93 - Use explicit events to transition between states
- b2828d41 - Merge branch 'update-performance-guide' into 'master'
- ad3e1edc - Added specs for started_at and finished_at
- d7b68151 - Fix test failures
-
ea4ac578 - Use event
enqueue
instead ofqueue
-
a7f84d1a - Improve transition between states for event
enqueue
- 6397ecd4 - Update ruby 2.3.1
- 7cfc4743 - Fix build play failure
- e0fc43eb - Instrument Project.visible_to_user
- 283b2c0b - Merge branch 'improve-pipeline-processing' into 'master'
- ec73abcd - Merge branch 'instrument-project-visible-to-user' into 'master'
- 8d1c7c5d - Merge branch '20059-environment-list' into 'master'
- 7b63f828 - Merge branch 'ruby-2-3-1' into 'master'
- 9e931575 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream
Toggle commit listAdded 1 commit:
- d41b05cf - conflict resolving
Added 1 commit:
- 9b94b52a - Fix GitLab Pages test failures
I fixed GitLab Pages failures.
mentioned in merge request !646 (closed)
@rymai these lines were exclusive of EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/2b11bcf185a220b5b8c7ceb5106c744c578c9f4d/lib/api/project_members.rb#L47-49
I'm not sure if you have taken care of it on
lib/api/members.rb
Added 1 commit:
- 6cb2559a - Don't use shoort options in elasticsearch docs.
Added 1 commit:
- 1301572a - Fix broken 'Edit Merge Request' spec.
Added 1 commit:
- 9d713a8f - Fix broken specs for DeployKeysController.
cc: @zj
@brodock do you have an idea about this broken build: https://gitlab.com/gitlab-org/gitlab-ee/builds/3076441looks like the URL used for Redis is wrong in the build (maybenil
?), locally the spec is green.It's fixed now :)
Edited by Rubén Dávila