CE upstream

Restored source branch ce_upstream

Added 1 commit:

66a1f4e1 - Update schema.rb

Added 34 commits:

249487f3 - Update VERSION to 8.12.0-rc6-ee
bcd02e0d - Update VERSION to 8.12.0-rc6
f60c82d0 - Merge branch 'JonTheNiceGuy/gitlab-ce-Ubuntu-16.04-Package'
182de594 - Merge branch 'vitalybaev/gitlab-ce-build-page-sidebar-coverage-horizontal-padding'
d0f5d9a1 - Merge branch 'zj-default-setting-features' into 'master'
b9e02703 - Merge branch 'rs-revert-rubocop-rspec-1-7' into 'master'
84e6b80b - Merge branch 'add_spec_for_committer_hash' into 'master'
8ad412e0 - Merge branch '21170-cycle-analytics' into 'master'
2f54abc5 - Merge branch 'and-you-get-awards' into 'master'
33bb5ddf - Merge branch 'show-all-pipelines-from-all-diffs' into 'master'
b4dbc373 - Merge branch 'limit-number-of-shown-environments' into 'master'
579aec79 - Merge branch '20310-new-project-btn' into 'master'
16ebf6c2 - Merge branch 'bump-shell-to-3-6-0' into 'master'
2eb4d004 - Merge branch 'post-merge-improve-of-ci-permissions' into 'master'
46f36341 - Merge branch 'issue_20078' into 'master'
01b896f3 - Merge branch 'doc/cycle-analytics' into 'master'
c525ec9b - Merge branch 'slash-commands-load-fix' into 'master'
62ba6805 - Merge branch 'feature/import-export-security-specs' into 'master'
98abf693 - Merge branch 'fix/import-security-specs' into 'master'
3f55188d - fix import/export security specs after merge
3b190a11 - Merge branch 'ad_recursive' into 'master'
ffa3e2da - Merge branch 'restrict_attrs_inc_ssh_pubkey' into 'master'
a2c1856e - Merge branch 'repository-size-restrictions' into 'master'
d8f52c4f - Merge remote-tracking branch 'ce/8-12-stable' into 8-12-stable-ee
4ce37039 - Add EE related models/associations to the spec.
302f9e68 - Revert "Merge branch '22364-rails-cache-redis-connection-pool' into 'master'"
ecb40664 - Merge remote-tracking branch 'ce/8-12-stable' into 8-12-stable-ee
e7714e56 - Add missing attributes for import/export projects in EE.
d356d1cd - Update VERSION to 8.12.0-rc7-ee
edb68433 - Remove "(unreleased)" from CHANGELOG-EE
a8a5a77e - Merge branch 'reorganize_sections_in_admin_settings' into 'master'
d49f410f - Merge branch 'doc/repo-restrictions-refactor' into 'master'
373ad85a - Merge branch 'docs/issue-closing-pattern' into 'master'
cd663882 - Merge branch '8-12-stable-ee' into ce_upstream

Added 1 commit:

8fe61bbd - fix CHANGELOG

@vsizov Did you manage to fix the conflicts @rdavila had when merging 8-12-stable into 8-12-stable-ee? See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/748#note_15865884

If yes, https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/748 might not be needed.

I resolved everything, including mentioned conflicts

But tests failing anyway and it seems like it's related to !748 (closed)

https://gitlab.slack.com/archives/development/p1474556704001968

@vsizov Thanks!

Mentioned in merge request !748 (closed)

Reassigned to @timothyandrew

The build was red because there were extra lines in schema.rb, which led to foreign keys being added twice. I've fixed this in a398d38b.

@vsizov: I'll assign back to you once the build turns green.

/cc @rymai

EDIT: The MR has not updated itself. Here is the build: https://gitlab.com/gitlab-org/gitlab-ee/pipelines/4374339

Reassigned to @vsizov

Cycle analytics specs (and migrations) are passing. The only failure ( https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6513 ) is unrelated to cycle analytics.

@timothyandrew Thanks

Added 29 commits:

a398d38b...47317f18 - 28 commits from branch master
497844d0 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream

@timothyandrew Could you take a look at this specs spec/features/protected_branches_spec.rb:112 Since you know this stuff best.

@timothyandrew Actually specs are failing because the form "Protect a branch" is completely broken in this branch. Could you take a look ASAP?

Added 122 commits:

fdab2bcc - Fix trivial typo in docs
f781202f - Fixed a broken documentation link to the wiki-specific-markdown.
81ba9b41 - Compress fork SVG code
bb5a7ef0 - Show badges in Milestone tabs and padding in Milestone list (both to match Issues page)
431506bf - Changeling
909deaa3 - Improved milestone counts with a single query
c1f508b0 - Use newer hash style
da7c1444 - Updated milestone count helper plus tests
db116fa0 - Take out of /dashboard/milestones as the helper query clashes with kaminari arrays
894bd04d - Added a small helper to reduce logic in the view
19e2bf1c - Fix failing specs and improve html
8499de19 - Ensure milestone counts work with no data
08083c75 - Removed z-index from flash container
f59eca6a - Fix find file navigation links
47b49624 - Fixed search dropdown labels not displaying
dd1c9542 - Fix typo in README.md
2c4fe74b - Added checks for field before field.length and removed unneeded fieldName
0d74154a - fix LDAP omniauth regression (Closes: #22357)
49f7da1b - Change "Please register or login" to "Please sign up or sign in"
a1b7beee - Update merge request versions documentation with new screenshots
4d63a156 - Update db/schema.rb per most recent migrations
13d3bd81 - Change location and refactor issue closing pattern documentation
c805ff80 - Merge branch 'docs/issue-closing-pattern' into 'master'
f76cb5f6 - Fix typos in cycle analytics docs
98b3d6ce - Merge branch 'docs/cycle-analytics' into 'master'
e6b491af - Bump gitlab-shell upgrade version to 3.6.0 for 8.12
6987ec29 - For empty merge_request_diff st_commits would be nil
8e4b8499 - Remove colons in dropdowns, use icon helper, and fix 'Show original' link.
f4f6f92c - Stop disabling jump_to_next buttons, when not on latest MR diff.
726071e6 - Intercept issues search form submit to preserve filters.
d626b429 - Hotfix the issuable counters when filtering by multiple labels
4ed23a3a - So that st_commits could never be nil
778c783b - Merge branch 'sh-bump-gitlab-shell-8.12' into 'master'
b0ce4ca1 - Add test for MergeRequestDiff#commits_sha, feedback:
fb0d1378 - Merge branch 'update-db-schema' into 'master'
8ed5be59 - Merge branch '22421-fix-issuable-counter-when-more-than-one-label-is-selected' into 'master'
2fea80d5 - Merge branch 'dz-improve-mr-versions-doc' into 'master'
74581261 - API: Return 404 when trying to fork to unaccessible namespace
9636b081 - Merge branch 'bpj-merge-request-diff-fixes' into 'master'
a41df736 - Merge branch 'fix-pipeline-for-empty-merge-request-diff' into 'master'
283f9633 - fix dropdowns for mr-versions
2450625b - Merge branch '22417-api-fork-fix' into 'master'
d104a3e1 - Add development environment database setup CI test
8b8e2626 - Fix pipeline fixtures for development environment
9aa0127c - Add artifacts with development log when seed fails
e7d24721 - Try cloning repositories before seeding database
dfc2fe77 - Revert "Merge branch '22421-fix-issuable-counter-when-more-than-one-label-is-sel…
88d83e2e - Describe how the recent changes of CI permissions affect builds
77271388 - Update permissions table
1e911e05 - Refactor new CI build permissions model docs
039415c8 - Move document on CI build permissions to new location
eda0c453 - Add a small description mentioning submodules/LFS
5e40cb2a - Make 'build permissions' consistent
c146c3e5 - Added a note about build triggers [ci skip]
68771115 - Improve CI job that tests database seeds
5fdc1f11 - Merge branch 'hotfix-gl-dropdown-field-undefined' into 'master'
2b06b169 - Merge branch 'search-field-ignores' into 'master'
8071dc83 - Merge branch 'fix-mr-version-dropdowns' into 'master'
76c8233b - s/project/build
d4e91b22 - Revert part of "Merge branch 'update_issues_mr_counter' into 'master'
04d78148 - Small fixes in CI build permissions docs
b228b86b - Make Gitlab::Redis.params safe for mutation
cf31bcf7 - Copyedit the CI build permissions doc
2a5cf05b - Merge branch 'ci-permissions-documentation' into 'master'
6c7cf9af - Merge branch 'revert-6455-and-4960' into 'master'
52e897dd - Update CurrentSettings class that uses ENV
294482f3 - Update VERSION to 8.13.0-pre
4d3dde47 - Merge branch 'rs-sign-up-sign-in' into 'master'
a8829f25 - Use base SHA for patches and diffs
588dc31a - Remove unused attributes
00a7ca74 - Merge branch 'fix-find-file-links' into 'master'
43701de5 - Makes Cycle analytics mobile friendly
2c2b487d - Improvements after review
8078f879 - Merge branch 'fix-variable-and-comments' into 'master'
2a423e03 - Merge branch 'search-filters-label-fix' into 'master'
c2083b79 - Limit test environment size to one project in CI
cee66810 - Remove use of USE_DB environment variable in code
3b746412 - Merge branch 'fork-svg' into 'master'
be906c26 - Improves design when in mobile and tablet
0560b7a2 - Add index on labels title
ac347028 - Eager-load assignee and labels associations for GlobalMilestore issuables
b8bfe50a - Reduce number of queries when calling GlobalMilestone#{labels,participants}
b5132118 - Ensure milestones passed to GlobalMilestone is an ActiveRecord::Relation
2161c72d - Use select(:foo) instead of map(&:foo) in GlobalMilestone
3753b847 - Update CHANGELOG
66cadfb4 - Merge branch 'redis-config-mutation' into 'master'
2a772b7d - Merge branch 'filipa-22444' into 'master'
bfbd81a8 - Fix landing widget state and improve Vue with state management.
d4de3ca0 - Set cookie path for cycle analytics cookie.
a3d3240d - Add link to broadcast messages docs
d114a522 - Merge branch 'cycle-analytics-js-improvements' into 'master'
5fbbf62f - Prepare CHANGELOG for 8.12.1 & 8.13.0
3f059257 - Merge branch 'fix/speed-up-group-milestone-show' into 'master'
74cd56b5 - Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce
bc16d767 - Fix CHANGELOG double-update
0fe33f92 - Revert "Fix a memory leak caused by Banzai::Filter::SanitizationFilter"
ca823aba - Fix the leak mentioned in 504a3b5e by another way
ae341be8 - Changed links that wrap the icon svg to display: block so there isn't any issu…
c2b8063f - Merge branch 'fix/database-seeds' into 'master'
bc132ba3 - Merge branch 'zj-link-broadcast-api-docs' into 'master'
640ab307 - Merge branch 'fix/memory-leak-sanitization-filter' into 'master'
a69afc53 - Merge branch '22459-tooltips-for-mini-pipeline-graph-in-pipeline-list-use-the-sv…
d4007fd4 - Merge branch 'flash-container-z-index' into 'master'
513629f3 - Merge branch 'gitlab-ce-milestone-tab-badges' into 'master'
8e15ded1 - Fix CHANGELOG.
6602b917 - Merge branch 'update-changelog' into 'master'
b12dedc0 - Merge branch 'patch-5' into 'master'
71507745 - Keep API mounts in alphabetical order
a894721e - Remove gitlab_meta gem
0a9f9c10 - Merge branch '22229-use-base-sha-when-downloading-merge-requests' into 'master'
7c93c381 - Fix typo in README
054f1ec6 - Merge branch 'cannonical-typo' into 'master'
1aca3670 - Merge branch 'rs-remove-gitlab_meta' into 'master'
a9f1e972 - Fixes issue with rails reserved keyword type exporting/importing services. Also …
a5b9e1c2 - added more specs
d70944d9 - fix changelog
23ed83a1 - Merge branch 'fix_trivial_doc_typo' into 'master'
bb8a41b2 - Merge branch 'ldap' into 'master'
adf50202 - Merge branch 'fix/import-services' into 'master'
fca610e5 - Merge branch 'api-alphabetical' into 'master'
477f0309 - Merge branch 'patch-2' into 'master'
77cf83aa - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream

Merged fresh CE upstream

CE master fixed the specs

Added 1 commit:

b4cc44cd - fix changelog

Status changed to merged

Mentioned in commit 4899de87

added Enterprise Edition label

CE upstream

Merge request reports

Activity