Merge CacheMarkdownField to EE

Restored source branch 18337-merge-cache-markdown-field-to-ee

Added 98 commits:

13a9dbc2 - 1 commit from branch gitlab-org:master
ce77bc0b - Move container_registry user docs to new location
44d1560d - Clarify the Plan to Code stages in Cycle Analytics docs
1553275e - Added CC0 license to list of licenses
4567e624 - Make pipeline processing asynchronous
d221a2c0 - Fix markdown URL link
0c8b9edc - Clarify what it means Test stage is not calculated in Total
f9b267d1 - Clarify Plan and Code stages more
548b919c - Clarify that the production environment is case-sensitive
b39649d9 - Take a new screenshot for Cycle Analytics
67dcc8db - update profile view
7bf53ee8 - Add example Cycle Analytics workflow
68774452 - Fix async pipeline and remove unrelated changes
57863874 - Use internal commit status API to check if finished
7d4767fb - Extract updating pipeline status to async worker
ebeee311 - Fix pipeline fixtures and calls to removed method
f57cfdb6 - Update order of build transition callbacks
5ce5abdc - Fix hipchat service specs after changes in pipeline
4e4640b1 - Add specs for new async ci pipeline workers
7f270d04 - Do not return false in commit status transition
d1c1b41f - add spaces and fix handle styles
84b7dd76 - Use Grape DSL to document methods and their params
a74c1243 - Don't include archived projects when creating group milestones
41d70ea3 - Added Issue Board API support
a1ee8cf5 - multi-file commit
b4d614bd - Fix inconsistent highlighting of already selected activity nav-links
15ff8dcb - Document GIT_STRATEGY=none
e23c1d88 - Replace bootstrap caret with fontawesome caret
0bbeff3d - Merge branch 'feature/improve-async-pipeline-processing' into 'master'
25c26f60 - Clarify some more the Cycle Analytics workflow example
640a4c88 - Use higher size on Gitlab::Redis connection pool on Sidekiq servers
0ddeb6eb - Merge branch 'docs/ca-feedback' into 'master'
333c02a8 - Fix broken handling of certain calls in GitHub importer client
1584dc02 - Merge branch '21337-introduce-git-strategy-none' into 'master'
ca3c0c6c - MergeRequest new form load diff asynchronously
951431bc - Merge branch '18663-perform-housekeeping-with-proper-connection-pool-size' into 'master'
4241c290 - Add new issue form to lists
4d9f76c1 - Added ability to save the new issue
674844d0 - Fixed issue with backlog list not saving
a9c98be0 - Moved form outside of list
284af578 - Added tests
da8998f9 - Changed how button is hidden when blank list
8af7c325 - Made the CSS a bit more reasonable
3397a8a6 - Added tooltip to new issue button
905af847 - Changed new issue button permissions
e7a4bbb0 - Add authorization to Projects::Boards::IssuesController#create action
97ec0c05 - Add service to create a new issue in a board list
fe3f1657 - Add tests to Projects::Boards::IssuesController#create action
b9ede4f1 - Update CHANGELOG
a68f1fdd - Fix form not re-enabling thanks to jQuery
2f53a8d0 - Shows error if response returns an error
9cc70031 - Merge branch 'jeroenj/gitlab-ce-group-milestone-archived-projects'
ab18d6b7 - Merge branch 'issue-board-api-support' into 'master'
5bdd8c3e - Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit'
85883938 - Use gitlab-workhorse 0.8.4
8a96910c - Merge branch 'rc-use-grape-dsl-to-document-members-api' into 'master'
f8da5eb8 - Revert "Label list shows all issues (opened or closed) with that label"
0afe899b - Update CHANGELOG
babb78d1 - Remove doctoc from administration/container_registry
0a7678b5 - Merge branch 'fix/github-importer-client' into 'master'
d7dd66ed - Merge branch 'new-merge-requests-commit-tab-active' into 'master'
8ad92369 - Remove the code finding an issue by undefined
9802d388 - Re-add CHANGELOG entries removed by merge (9cc70031)
a4834770 - Only hide deploy status external link on small screens.
01af0aab - Only hide external link text, not icon/link.
dcfda304 - Merge branch 'revert/5991' into 'master'
9a13f885 - Merge branch 'issue-boards-new-issue' into 'master'
f4c2f3a4 - Change issue board defaults
21f0c27a - Merge branch 'creative-commons-zero' into 'master'
5c7904d7 - Add tag shortcut from the Commit page
7c8c8088 - Merge branch 'akramfares/gitlab-ce-master'
db77289b - Document how to change the Registry's internal port
2fc6e85d - Change link to point to new location
6b90ccb9 - Change user & group landing page routing from /u/:name & /groups/:name to /:name
10526031 - Fix users feature spec
42c6555b - Make user constrainer lookup same as controller and add more constrainer tests
b356c7dd - Update user routing spec after constrainer logic changed
63201925 - Merge branch 'deploy-widget' into 'master'
1845c33d - spacing tweaks
5766e066 - Memoize ActiveRecord::Migrator.migrations in tests
aada0103 - Improve issue load time performance by avoiding ORDER BY in find_by call
d6d295d4 - Merge branch 'replace-bootstrap-caret' into 'master'
c230946e - Merge branch 'docs/refactor-registry' into 'master'
6c405b95 - Merge branch 'sh-fix-issue-perf-order-by-issue' into 'master'
c9a5aee8 - Link to Registry docs from project settings
49d6ca62 - Merge branch 'dz-root-url' into 'master'
771f2af5 - Merge branch 'update-profile-view' into 'master'
2bc72151 - Merge branch 'link-to-registry-from-project-settings' into 'master'
567bcf14 - Merge branch 'gitlab-workhorse-0.8.4' into 'master'
a625757c - Merge branch 'fix-already-selected-activity-link' into 'master'
35e231b5 - Update issue board spec
8068d3e1 - Merge branch '23025-issue-boards-defaults' into 'master'
4a90e25f - Merge branch '23034-memoize-ar-migrator-migrations-in-tests' into 'master'
e94cd6fd - Add markdown cache columns to the database, but don't use them yet
109816c4 - Use CacheMarkdownField for notes
dd159a75 - Make search results use the markdown cache columns, treating them consistently
99205515 - Enable CacheMarkdownField for the remaining models
110e15da - Add a CHANGELOG for CacheMarkdownField

@nick.thomas Looks good, but it's hard to see where were the conflicts. By any chance do you have the list? We should start creating a list of files that conflict often as suggested by @rspeicher in https://gitlab.com/gitlab-org/gitlab-ee/issues/715

@rymai here's the output:

rom ../gitlab
 * branch            HEAD       -> FETCH_HEAD
Auto-merging spec/services/system_note_service_spec.rb
Auto-merging spec/services/merge_requests/merge_service_spec.rb
Auto-merging spec/services/git_push_service_spec.rb
Auto-merging spec/requests/api/projects_spec.rb
Auto-merging spec/requests/api/members_spec.rb
Auto-merging spec/models/service_spec.rb
Auto-merging spec/models/project_spec.rb
Auto-merging spec/models/project_services/hipchat_service_spec.rb
Auto-merging spec/helpers/projects_helper_spec.rb
Auto-merging spec/factories/projects.rb
Auto-merging lib/api/members.rb
Auto-merging lib/api/entities.rb
Auto-merging lib/api/api.rb
Auto-merging doc/install/installation.md
Removing doc/container_registry/img/project_feature.png
Removing doc/container_registry/img/container_registry.png
Auto-merging doc/README.md
Auto-merging db/schema.rb
CONFLICT (content): Merge conflict in db/schema.rb
Auto-merging config/routes/user.rb
Auto-merging config/routes/project.rb
Auto-merging config/routes/group.rb
Auto-merging app/views/shared/_sort_dropdown.html.haml
Auto-merging app/views/projects/tags/index.html.haml
Auto-merging app/views/projects/merge_requests/widget/open/_accept.html.haml
Auto-merging app/views/projects/edit.html.haml
CONFLICT (content): Merge conflict in app/views/projects/edit.html.haml
Auto-merging app/views/projects/commits/_commit.html.haml
Auto-merging app/views/projects/branches/index.html.haml
Auto-merging app/views/projects/_home_panel.html.haml
Auto-merging app/views/layouts/header/_default.html.haml
Auto-merging app/views/layouts/devise.html.haml
CONFLICT (content): Merge conflict in app/views/layouts/devise.html.haml
Auto-merging app/views/help/index.html.haml
Auto-merging app/services/files/base_service.rb
Auto-merging app/models/snippet.rb
Auto-merging app/models/repository.rb
Auto-merging app/models/project.rb
Auto-merging app/models/note.rb
Auto-merging app/models/namespace.rb
Auto-merging app/models/milestone.rb
Auto-merging app/models/merge_request.rb
Auto-merging app/models/concerns/issuable.rb
Auto-merging app/models/application_setting.rb
Auto-merging app/helpers/search_helper.rb
Auto-merging app/helpers/application_settings_helper.rb
CONFLICT (content): Merge conflict in app/helpers/application_settings_helper.rb
Auto-merging app/helpers/appearances_helper.rb
Auto-merging app/controllers/projects/merge_requests_controller.rb
CONFLICT (content): Merge conflict in app/controllers/projects/merge_requests_controller.rb
Auto-merging app/controllers/projects/issues_controller.rb
Auto-merging app/controllers/application_controller.rb
Auto-merging app/assets/stylesheets/framework/selects.scss
Auto-merging app/assets/javascripts/lib/utils/common_utils.js
Auto-merging Gemfile.lock
Auto-merging Gemfile
Auto-merging CHANGELOG
Automatic merge failed; fix conflicts and then commit the result.

# [...]

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   app/controllers/projects/merge_requests_controller.rb
        both modified:   app/helpers/application_settings_helper.rb
        both modified:   app/views/layouts/devise.html.haml
        both modified:   app/views/projects/edit.html.haml
        both modified:   db/schema.rb

The merge_requests_controller one was the most troublesome for me.

@nick.thomas Thanks! LGTM!

@rspeicher I'm assigning to you since you merged the CE MR. Thanks!

Milestone changed to %8.13

Reassigned to @rspeicher

Added CE upstream label

Enabled an automatic merge when the build for 5f47d815 succeeds

Failure looks genuine

  1) Contributions Calendar 10 calendar activities displays calendar activity square color for 10 contributions
     Failure/Error: page.evaluate_script('jQuery.active').zero?

     Capybara::Poltergeist::JavascriptError:
       One or more errors were raised in the Javascript code on the page. If you don't care about these errors, you can ignore them by setting js_errors: false in your Poltergeist configuration (see documentation for details).

       ReferenceError: Can't find variable: jQuery
       ReferenceError: Can't find variable: jQuery
           at undefined:1
           at :1
           at :1
     # ./spec/support/wait_for_ajax.rb:9:in `finished_all_ajax_requests?'
     # ./spec/support/wait_for_ajax.rb:4:in `block in wait_for_ajax'
     # ./spec/support/wait_for_ajax.rb:3:in `wait_for_ajax'
     # ./spec/features/calendar_spec.rb:58:in `block (2 levels) in <top (required)>'

Have you rebased master? This might be a problem fixed by gitlab-org/gitlab-ce!6758.

@stanhu that commit isn't in this MR, no, so it could well be that.

I've set off another retry, Just In Case It Works, and I'm testing a bigger merge, which will pull that commit from CE to EE too, here:

https://gitlab.com/nick.thomas/gitlab-ee/commits/18337-merge-cache-markdown-field-to-ee-2

(pipeline hasn't shown up yet)

If it works, I'll push to this branch.

Extra merge conflicts in that branch:

doc/api/projects.md
doc/raketasks/backup_restore.md
lib/gitlab/backend/shell.rb

Added 117 commits:

05745737 - Explain the extra chmod
ec50d20d - Rebase and resolve conflicts in backup doc for !3761
069d739e - Added "CI secret variables" per @axil.
de61ebc8 - Make Member#add_user set access_level for requesters
19af4ca8 - Add systemctl daemon-reload to fix Ubuntu 16.04.1 warning
3a3063b1 - Update 8.11-to-8.12.md
dcd26969 - Update 8.10-to-8.11.md
302d4262 - Update 8.9-to-8.10.md
5976bff2 - Update 8.8-to-8.9.md
6219c36d - Update 8.7-to-8.8.md
61e9fb55 - Update 8.6-to-8.7.md
c65af5d2 - Update 8.5-to-8.6.md
6c02ce48 - Update 8.4-to-8.5.md
47a133d3 - Update 8.3-to-8.4.md
c3aca56e - Update 8.2-to-8.3.md
e56dab54 - Update 8.1-to-8.2.md
d5ea7b6b - Update 8.0-to-8.1.md
b6b50335 - docs: clarify /projects endpoint description
e956a24d - api: add /projects/visible API endpoint
355f97f8 - Move /projects/visible entry to 8.13
42cb6597 - Update API docs and specs for /projects/visible
b189a34b - Updates Last Deployment column in environmnets list.
2f01392d - Updates Last Deployment column in environmnets list according to design
5e1c986b - Adds Build column to environments list
0a1baaa8 - Tidy up project list actions
c7afe1e5 - Adds reference to the merge request in the commit column
34efdef1 - Adds external url
c8c9ccbd - Adds verification beore showing user avatar
28f85cef - Removes 'hidden-xs' class from user_avatar helper in order for it to be visible …
8de767c4 - Verifies if user is available
38963040 - Fixes linter problems
2347d0e6 - Adds responsive behaviour equal to the one in Pipelines and Builds table
86c0c086 - Switch from request to env in ::API::Helpers
3e13a45a - Removes Merge Request reference from commit column due to performance issues
fe46e4eb - Load Github::Shell's secret token from file on initialization instead of every request.
d89c07e0 - Add tooltip to project fork count
f7303dd6 - Adds CHANGELOG entry
8522fc15 - Add notice about HTTPS cloning for CI
67b85665 - Try tmpfs for repository storage, etc
8443cee0 - Fixes external_url link
f415a32e - Adds test for external link in environment details
ce368e74 - Removes unused variable
e369455f - Removes try
7cf68093 - Truncate long labels with ellipsis in labels page
1d35c5b3 - Improve project policy spec
6678fab3 - Merge branch 'forks_tooltip' into 'master'
1c462cf7 - Call ensure_secret_token! in secret token test's before block since it would be …
57e72cba - Update user whitelist reject message
16626409 - Fix Event#reset_project_activity updates
c2cf1dd6 - Merge branch 'ci-https' into 'master'
7623ab0c - Make projects API docs match parameter style
a17412f0 - Merge branch '18337-cache-html-in-database' into 'master'
b58ea12a - Merge branch '22820-api-use-env-not-request-in-helpers' into 'master'
1be15162 - Merge branch 'ben.boeckel/gitlab-ce-api-visible-projects' into 'master'
0876b460 - Merge branch 'memoize_shell_secret_token' into 'master'
908b37bc - Updates test in order to look for link
8581df3b - Merge branch 'sh-fix-events-update-spec' into 'master'
061d1e2d - Merge branch 'mrchrisw/remove-whitelist' into 'master'
f5631ff2 - Fix ci pipeline processing with async jobs
2f7e28d1 - Improve the contribution and MR review guide
9afb2dac - ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job…
81d8a0dd - Added missing content and improved layout
52ca9bf6 - Fix typo and add he MWBS accronym for "Merge When Build Succeeds"
328ca8c4 - Optimize the award_user_list helper spec
2a37e684 - Merge branch '23051-restore-missing-university-content' into 'master'
03177733 - Deletes extra empty line breaking the build
212cf8f9 - Merge branch 'rs-optimize-award_user_list-spec' into 'master'
4e34a495 - Debounce GfmAutoComplete setup and simplify code somewhat.
e565183c - Merge branch 'backport-part-of-ee-744' into 'master'
1243cab2 - Merge branch '22774-retouch-environments-deployments' into 'master'
2cd8b5d2 - Merge branch 'patch-6' into 'master'
c901936a - Merge branch '23096-expire-artifacts-per-job' into 'master'
4f1de5fa - Correct namespace validation to forbid bad names #21077
d6d61aad - Update Gitlab Shell to fix errors moving projects between storages
48099e07 - Merge branch 'improve-contributing' into 'master'
28ca8502 - Merge branch '22953-label-with-long-title-overlaps-description-field' into 'master'
4695bb88 - Use Hash rocket syntax to maintain Ruby 2.1 compatibility in spec
ed2fe984 - Merge branch 'sh-fix-for-ruby-2.1.0-spec' into 'master'
e72f2cfc - Fix missing constraints causing route failures when usernames with periods are used
4e963fed - Merge branch 'sh-add-user-constraints' into 'master'
04afdb61 - Improve spec for merge when build succeeds feature
74fd5cab - Improve transitions and run hooks after transaction
3fb4d86c - Add temporary fix for race condition in MWBS
904de2d6 - Check for transition loopback in commit status
ef7f16fa - Fix a typo in doc/api/labels.md
90b0162c - reword html titles for merge requests and issues
40fa1b6e - Use user from let instead recreate in before
1cf2b9a6 - Make searching for commits case insensitive.
f3c55164 - Prevent conflict b/w search field and its dropdown
b6a83be6 - Merge branch 'brennanroberts/gitlab-ce-22872-prevent-default-search-autocomplete'
ed24cf05 - Fix wrong icon in CI build detail sidebar: right-arrow => arrow-right
434d98b2 - Merge branch 'gjlaubenstein/gitlab-ce-21712-change-issue-show-html-title'
2879da8c - Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master'
2e55580b - Merge branch 'tests-use-tmpfs' into 'master'
2d3210fd - Merge branch 'shell-update' into 'master'
5b5a2a5d - Merge branch 'adam-commit-search-case-insensitive' into 'master'
680b675e - Merge branch 'bpj-mr-loop' into 'master'
6f18c0a0 - Merge branch '23123-build-sidebar-selected-build' into 'master'
b26a3d53 - Merge branch 'fix-typo_doc-api-labels.md' into 'master'
7336e73b - Add link to test coverage report to README
f5576b16 - Merge branch 'namespace-validation-fixes' into 'master'
359b4f9a - Merge branch 'fix/async-pipeline-processing-stale-data' into 'master'
ee2d3922 - Clarify which token should be used to delete a runner
516d869e - Merge branch 'gtrafimenkov/gitlab-ce-clarify-runners-delete-token' into 'master'
aac2af5b - HTMLEntityFilter -> HtmlEntityFilter
36bf0b67 - Remove Ci::ApplicationController
b06acbf5 - Merge branch 'tnir/gitlab-ce-23068-cleanup-ci-application-controller'
ee9b75fd - Changes to make Git basics more intuitive
db326604 - Updating changes based on feedback from @connorshea
4ce9a783 - Merge branch 'jerdog/gitlab-ce-update-start-using-git-documentation' into 'master'
1659c3b8 - Merge branch 'explain-0600' into 'master'
7aa9675f - Add registry to skipped data in backup raketask docs
4c8ea149 - Merge branch 'jmcgeheeiv/gitlab-ce-patch-1' into 'master'
d035f783 - Merge branch 'use-let-in-tests' into 'master'
494269fc - Merge branch 'fix-misnamed-constant' into 'master'
a5cd9c9a - Merge branch 'doc/link-coverage-badge-to-coverage-report' into 'master'
19246b14 - Branch merge

@nick.thomas @rspeicher LGTM, thanks!

Status changed to merged

Mentioned in commit 7fb8bfb4

Admin message

Admin message

Merge CacheMarkdownField to EE

Merge request reports

Activity