delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix bug in CommitCheckfj-fix-bug-commit-check	Francisco Javier López	2018-11-14	1	-2/+2
\|
*	Merge branch 'sh-bump-redis-store' into 'master'	Rémy Coutable	2018-11-12	2	-2/+2
\|\ \| \| \| \| \| \| \| \|	Bump redis-store to 1.6.0 See merge request gitlab-org/gitlab-ce!22963
\| *	Bump redis-store to 1.6.0sh-bump-redis-store	Stan Hu	2018-11-10	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This version supports SSL/TLS via the redis:// URL scheme: https://github.com/redis-store/redis-store/blob/master/CHANGELOG.md Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/47702
* \|	Merge branch 'sh-bump-mime-types' into 'master'	Rémy Coutable	2018-11-12	2	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Bump mime-types to 3.2.2 See merge request gitlab-org/gitlab-ce!22957
\| * \|	MIME type application/javascript -> application/ecmascriptsh-bump-mime-types	Stan Hu	2018-11-10	1	-1/+1
\| \| \|
\| * \|	Bump mime-types to 3.2.2	Stan Hu	2018-11-09	1	-2/+2
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Full list of changes: https://github.com/mime-types/ruby-mime-types/blob/master/History.md This matches the version shipped in gitaly-ruby.
* \|	Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'	Douwe Maan	2018-11-12	21	-60/+1264
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
\| * \|	Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flag	Oswaldo Ferreira	2018-11-09	21	-60/+1264
\| \| \|
* \| \|	Merge branch 'patch-31' into 'master'	Stan Hu	2018-11-12	1	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set an empty entrypoint for license_management job Closes #53786 See merge request gitlab-org/gitlab-ce!22955
\| * \| \|	Set an empty entrypoint for license_management job	Philippe Lafoucrière	2018-11-10	1	-1/+3
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'leipert-remove-unnecessary-dependencies' into 'master'	Rémy Coutable	2018-11-12	1	-3/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary job dependencies See merge request gitlab-org/gitlab-ce!22961
\| * \| \|	Remove unnecessary job dependenciesleipert-remove-unnecessary-dependencies	Lukas Eipert	2018-11-10	1	-3/+5
\| \|/ /
* \| \|	Merge branch 'mr-tree-filter-path-name' into 'master'	Filipa Lacerda	2018-11-12	3	-2/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed diff tree filtering to path Closes #53781 See merge request gitlab-org/gitlab-ce!22978
\| * \| \|	Changed diff tree filtering to path	Phil Hughes	2018-11-12	3	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously it was using name which could make it hard to filter for the file you want in a certain folder. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53781
* \| \| \|	Merge branch 'discussion-perf-improvement' into 'master'	Filipa Lacerda	2018-11-12	9	-23/+38
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve initial rendering of discussion notes See merge request gitlab-org/gitlab-ce!22607
\| * \| \| \|	Consistently use Vue.nexTick when starting taskListdiscussion-perf-improvement	Phil Hughes	2018-11-09	1	-8/+11
\| \| \| \| \|
\| * \| \| \|	Fixed failing note actions spec	Phil Hughes	2018-11-09	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Init task list when creating new note & discussion	Phil Hughes	2018-11-09	2	-0/+2
\| \| \| \| \|
\| * \| \| \|	Fix TaskList init on update & poll	Phil Hughes	2018-11-09	3	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed duplicate TaskList requests being made
\| * \| \| \|	Improve initial rendering of discussion notes	Phil Hughes	2018-11-09	5	-13/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This improves the initial rendering performance of notes by only creating a new TaskList for the whole app, rather than on a per-note component basis.
* \| \| \| \|	Merge branch 'rails5-update-gemfile' into 'master'	Sean McGivern	2018-11-12	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade whitequark/parser to 2.5.3.0 See merge request gitlab-org/gitlab-ce!22984
\| * \| \| \| \|	Upgrade whitequark/parser to 2.5.3.0	Jan Provaznik	2018-11-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails 5 counterpart to the version update from 7fb30b4cc4994022e55460e6905996212859cfb6
* \| \| \| \| \|	Merge branch 'docs-dev-guidelines-update' into 'master'	Achilleas Pipinellis	2018-11-12	3	-319/+459
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: updates docs development guidelines Closes #53160 and #53115 See merge request gitlab-org/gitlab-ce!22813
\| * \| \| \| \| \|	Docs: updates docs development guidelines	Marcia Ramos	2018-11-12	3	-319/+459
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs/danger-documentation' into 'master'	Rémy Coutable	2018-11-12	1	-3/+26
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dangerbot: mention tech writers based on DevOps stage See merge request gitlab-org/gitlab-ce!22945
\| * \| \| \| \| \|	Proper markdown table in docs Dangerfile	Achilleas Pipinellis	2018-11-12	1	-14/+16
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Edits to docs Dangerfiledocs/danger-documentation	Mike Lewis	2018-11-09	1	-10/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Dangerbot: mention tech writers based on DevOps stage	Achilleas Pipinellis	2018-11-09	1	-3/+13
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-bump-sidekiq' into 'master'	Sean McGivern	2018-11-12	2	-5/+5
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Sidekiq and other related gems See merge request gitlab-org/gitlab-ce!22956
\| * \| \| \| \| \|	Update gems in Gemfile.rails5.lock	Jan Provaznik	2018-11-12	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Bump Sidekiq and other related gems	Stan Hu	2018-11-09	1	-3/+3
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Sidekiq changes: https://github.com/mperham/sidekiq/blob/master/Changes.md * Rack 1.6.1 fixes CVE-2014-9490: https://github.com/rack/rack/blob/master/CHANGELOG.md * rack-protection 2.0.4 only fixes a minor message: https://github.com/sinatra/sinatra/commits/master/rack-protection
* \| \| \| \| \|	Merge branch 'jprovazn-fix-status-spec' into 'master'qa-xss-in-mentions-test	Rémy Coutable	2018-11-12	1	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ./spec/features/issues/user_views_issue_spec.rb Closes gitlab-ee#8390 See merge request gitlab-org/gitlab-ce!22976
\| * \| \| \| \| \|	Fix transient rspec issue	Jan Provaznik	2018-11-12	1	-3/+3
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI randomly fails with: ActiveRecord::RecordNotFound: Couldn't find Project with 'id'=724 This is probably caused by DB cleanup strategy used for :js tests in combination with `set`.
* \| \| \| \| \|	Merge branch 'blackst0ne-add-discord-service' into 'master'	Sean McGivern	2018-11-12	15	-242/+374
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684
\| * \| \| \| \| \|	Fix minor offensesblackst0ne-add-discord-service	blackst0ne	2018-11-10	2	-6/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Refactor specs	blackst0ne	2018-11-07	4	-469/+253
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	DRY specs, fix typos in docs	blackst0ne	2018-11-06	5	-45/+35
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update documentation after documentation review.	blackst0ne	2018-11-05	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Updated docs and removed redundant screenshot	blackst0ne	2018-11-05	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update docs after docs review	blackst0ne	2018-11-05	1	-14/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update Gemfile	blackst0ne	2018-11-05	3	-17/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix frozen strings	blackst0ne	2018-11-05	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update documentation	blackst0ne	2018-11-05	3	-0/+31
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add spec for DiscordService	blackst0ne	2018-11-05	1	-0/+242
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update discord notification service	blackst0ne	2018-11-05	1	-6/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add changelog entry	blackst0ne	2018-11-05	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add Discord integration	blackst0ne	2018-10-30	9	-0/+95
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'disable-usage-ping-review-apps' into 'master'	Rémy Coutable	2018-11-12	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable usage pings in review apps See merge request gitlab-org/gitlab-ce!22965
\| * \| \| \| \| \| \|	Disable usage pings in review appsdisable-usage-ping-review-apps	Balasankar "Balu" C	2018-11-11	1	-0/+1
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2018-11-12	3	-5/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markup' into 'master' Update gitlab-markup gem to avoid binary name collision Closes #53082 See merge request gitlab-org/gitlab-ce!22960