changelogs/unreleased · 7ff9008f3e533f2e0442c7a07ef1c67c119822ea · Forest Godfrey / gitlab-ce

Merge branch 'master' into 1827-prevent-concurrent-editing-wiki · 9b25bbc4

authored Jul 23, 2017

 Conflicts:
	app/controllers/projects/wikis_controller.rb
	app/views/projects/wikis/edit.html.haml
	spec/features/projects/wiki/user_updates_wiki_page_spec.rb

9b25bbc4

Name	Last commit	Last update
..
.gitkeep		Loading commit data...
10085-stop-encoding-user-name.yml		Loading commit data...
12892-reset-css-text-align-to-initial-for-rtl.md		Loading commit data...
1827-prevent-concurrent-editing-wiki.yml		Loading commit data...
19629-remove-inactive-tokens-list.yml		Loading commit data...
20817-please-add-coordinator-url-to-admin-area-runner-page.yml		Loading commit data...
22619-add-an-email-address-to-unsubscribe-list-header-in-email		Loading commit data...
23036-replace-dashboard-event-filters-spinach.yml		Loading commit data...
23036-replace-dashboard-spinach.yml		Loading commit data...
26908-make-timelogs-use-foreign-keys		Loading commit data...
29901-refactor-initialization-dropzone_input-js.yml		Loading commit data...
31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue.yml		Loading commit data...
32340-correct-jobs-api-documentation		Loading commit data...
33741-clarify-k8s-service-keys.yml		Loading commit data...
33770-respect-blockquote-line-breaks.yml		Loading commit data...
34075-pipelines-count-mt.yml		Loading commit data...
34534-update-vue-resource.yml		Loading commit data...
34549-extract-devise-mappings-into-helper.yml		Loading commit data...
34563-usage-ping-github.yml		Loading commit data...
34729-blob.yml		Loading commit data...
34810-vue-pagination.yml		Loading commit data...
34831-remove-coffee-rails-gem.yml		Loading commit data...
34858-bump-scss-lint-to-0-54-0.yml		Loading commit data...
34867-remove-net-ssh-gem.yml		Loading commit data...
34927-protect-manual-actions-on-tags.yml		Loading commit data...
34978-remove-public-ci-favicon-ico.yml		Loading commit data...
35155-upgrade-fog-core-to-1-44-3-and-its-providers-to-the-latest.yml		Loading commit data...
35164-cycle-analytics-firefox.yml		Loading commit data...
35181-cannot-create-label-from-board-page.yml		Loading commit data...
35225-transient-poll.yml		Loading commit data...
35253-desc-protected-branches-for-non-member.yml		Loading commit data...
5971-webhook-testing.yml		Loading commit data...
add-mock-deployment-and-monitoring-service-for-development.yaml		Loading commit data...
artifacts-download-dropdown-menu-is-too-narrow.yml		Loading commit data...
enable-scss-lint-bang-format.yml		Loading commit data...
enable-scss-lint-declaration-order.yml		Loading commit data...
enable-scss-lint-import-path.yml		Loading commit data...
enable-scss-lint-property-spelling.yml		Loading commit data...
enable-scss-lint-space-after-comma.yml		Loading commit data...
enable-scss-lint-unnecessary-parent-reference.yml		Loading commit data...
feature-gb-auto-retry-failed-ci-job.yml		Loading commit data...
fix-sm-32790-pipeline_schedules-pages-throwing-error-500.yml		Loading commit data...
fixes-for-internal-auth-disabled.yml		Loading commit data...
mr-branch-link-use-tree.yml		Loading commit data...
pass-before-script-as-is.yml		Loading commit data...
remove-nprogress-gleaning.yml		Loading commit data...
replace_spinach_spec_browse_files.yml		Loading commit data...
repository-name-emojis		Loading commit data...
request-store-wrap.yml		Loading commit data...
sh-structured-logging.yml		Loading commit data...
toggle-new-project-import-description.yml		Loading commit data...
zj-pipeline-badge-improvements.yml		Loading commit data...