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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add mysql_compatible_index_length to migration helpersdz-migration-index-helper	Dmitriy Zaporozhets	2018-09-21	5	-7/+17
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch '44768-lazy-load-xterm-css' into 'master'	Phil Hughes	2018-09-20	4	-0/+11
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Lazy load xterm css custom colors file Closes #44768 See merge request gitlab-org/gitlab-ce!21804
\| *	Lazy load xterm css colors	Filipa Lacerda	2018-09-19	4	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Manually includes the xterm custom colors on the 3 files that will need it: job log page, job terminal page, environment terminal page Reduces main CSS bundle
* \|	Merge branch '51201-document-review-apps-docs' into 'master'	Marin Jankovski	2018-09-20	2	-0/+88
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document Review Apps Closes #51201 See merge request gitlab-org/gitlab-ce!21574
\| * \|	Document review apps setup for gitlab-{ce,ee}	Rémy Coutable	2018-09-17	2	-0/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me> Signed-off-by: ddavison <ddavison@gitlab.com>
* \| \|	Merge branch '50347-fix-scrolling-to-diff-note-after-incremental-rendering' ↵	Phil Hughes	2018-09-20	5	-40/+215
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Link to file in Changes tab of MR no longer works for all files after incremental rendering improvement" Closes #50347 See merge request gitlab-org/gitlab-ce!21727
\| * \| \|	Resolve "Link to file in Changes tab of MR no longer works for all files ↵	André Luís	2018-09-20	5	-40/+215
\|/ / / \| \| \| \| \| \| \| \| \|	after incremental rendering improvement"
* \| \|	Merge branch 'docs-dev-guidelines-milestones' into 'master'	Achilleas Pipinellis	2018-09-20	1	-0/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain the docs' CD, relating to the milestone the doc is set to vs online docs See merge request gitlab-org/gitlab-ce!21737
\| * \| \|	Explain the docs' CD, relating to the milestone the doc is set to vs online docs	Marcia Ramos	2018-09-20	1	-0/+16
\|/ / /
* \| \|	Merge branch 'docs/rs-update-docs' into 'master'	Achilleas Pipinellis	2018-09-20	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct Gitaly config typo in update guides See merge request gitlab-org/gitlab-ce!21821
\| * \| \|	Correct Gitaly config typo in update guides	Robert Speicher	2018-09-19	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The 9.4 to 9.5 and 9.5 to 10.0 guides missed a closing backtick. This was corrected in the 10.0 to 10.1 guide, from which subsequent guides were written without the error.
* \| \| \|	Merge branch 'docs/fix-releases-link' into 'master'	Achilleas Pipinellis	2018-09-20	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix link to blog posts in docs See merge request gitlab-org/gitlab-ce!21820
\| * \| \|	Fix link to blog posts	Evan Read	2018-09-20	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Due to a missing `s`, a link to the blog archive for releases was broken.
* \| \|	Merge branch 'sh-delete-tags-outside-transaction' into 'master'	Robert Speicher	2018-09-19	6	-7/+24
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete container repository tags outside of transaction Closes #51380 See merge request gitlab-org/gitlab-ce!21679
\| * \| \|	Move registry destroy out of project transaction	Stan Hu	2018-09-19	5	-9/+18
\| \| \| \|
\| * \| \|	Delete container repository tags outside of transaction	Stan Hu	2018-09-19	4	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When there are many tags in a container repository, deleting them can exceed the default 60 second idle-in-transaction timeout in Sidekiq. We now explicitly delete them in the DestroyService before destroying the model. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51380
* \| \| \|	Merge branch 'fix-rubocop-todo' into 'master'	Douglas Barbosa Alexandre	2018-09-19	7	-21/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rubocop Style/ZeroLengthPredicate See merge request gitlab-org/gitlab-ce!21793
\| * \| \| \|	Fix rubocop Style/ZeroLengthPredicate	Semyon Pupkov	2018-09-18	7	-21/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'relax-danger-commit-subject-rules' into 'master'	Robert Speicher	2018-09-19	1	-2/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relax the subject line requirements for commits Closes gitlab-org/release/framework#16 See merge request gitlab-org/gitlab-ce!21811
\| * \| \| \| \|	Relax the subject line requirements for commits	Yorick Peterse	2018-09-19	1	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes the hard limit of 50 to a soft limit of 50, with the new hard limit being 72 characters. This gives people a bit more space, while still (hopefully) guiding them towards subject lines that are roughly 50 characters long. Fixes https://gitlab.com/gitlab-org/release/framework/issues/16
* \| \| \| \| \|	Merge branch 'mr-legacy-diff-notes' into 'master'	Filipa Lacerda	2018-09-19	11	-25/+239
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-enable legacy diff notes on merge request diffs Closes #48873 See merge request gitlab-org/gitlab-ce!21652
\| * \| \| \| \| \|	Changed isDiscussionApplicableToLine to accept an object	Phil Hughes	2018-09-18	3	-16/+28
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added specs to isDiscussionApplicableToLine	Phil Hughes	2018-09-17	1	-10/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It now tests for the latest diff check
\| * \| \| \| \| \|	Updated latestDiff logic to only be used to LegacyDiffNotes	Phil Hughes	2018-09-17	2	-5/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Updated LegacyDiffNote logic	Phil Hughes	2018-09-17	5	-11/+30
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Moved legacy diff note check into util method	Phil Hughes	2018-09-17	3	-11/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Un-commented out expect checks in mutation spec
\| * \| \| \| \| \|	Fixed diff store actions spec	Phil Hughes	2018-09-17	4	-1/+140
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated diff mutations and utils spec to check for legacy notes
\| * \| \| \| \| \|	Re-enable legacy diff notes on merge request diffs	Phil Hughes	2018-09-17	8	-20/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This re-enables legacy diff notes on the merge request diffs This feature was not workig correctly after the Vue refactor LegacyDiffNotes have no `position`, instead they only have a `line_code` As an extra, this also re-enables commenting on legacy diffs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48873
* \| \| \| \| \| \|	Merge branch 'bvl-remove-unused-regex' into 'master'	Lin Jen-Shin	2018-09-19	1	-1/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused constant See merge request gitlab-org/gitlab-ce!21810
\| * \| \| \| \| \| \|	Remove unused constantbvl-remove-unused-regex	Bob Van Landuyt	2018-09-19	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes an unused constant from the `RubyInterpolationInTranslation`. The constant was used in a first implementation of this class.
* \| \| \| \| \| \| \|	Merge branch 'fix-setup-grammar-2-ce' into 'master'	Douwe Maan	2018-09-19	37	-158/+158
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar in runner-related specs, views and localisations. See merge request gitlab-org/gitlab-ce!21691
\| * \| \| \| \| \| \|	Fix grammar in runner-related specs, views and localisations.	Marcel Amirault	2018-09-19	37	-158/+158
\|/ / / / / / /
* \| \| \| \| \| \|	Include post migrations when loading the schema	Yorick Peterse	2018-09-19	5	-11/+57
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request gitlab-org/gitlab-ce!21689
\| * \| \| \| \| \| \|	Add merge-request to changelog	DJ Mountney	2018-09-12	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix the schema load test	DJ Mountney	2018-09-12	2	-11/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And added changelog
\| * \| \| \| \| \| \|	Ensure the schema is loaded with post_migrations included	DJ Mountney	2018-09-11	4	-11/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If doing a schema load, the post_migrations should also be marked as up, even if SKIP_POST_DEPLOYMENT_MIGRATIONS was set, otherwise future migration runs will be broken.
* \| \| \| \| \| \| \|	Merge branch 'osw-use-diff-stats-rpc-on-comparison-views' into 'master'	Nick Thomas	2018-09-19	16	-11/+258
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use standalone diff stats RPC on every comparison view Closes #51477, #20282, and #49399 See merge request gitlab-org/gitlab-ce!21778
\| * \| \| \| \| \| \| \|	Use standalone diff stats RPC on every comparison view	Oswaldo Ferreira	2018-09-19	16	-11/+258
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'refactor-main-js' into 'master'	Phil Hughes	2018-09-19	44	-143/+130
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor main.js content See merge request gitlab-org/gitlab-ce!19783
\| * \| \| \| \| \| \| \|	Move shortcuts classes into behaviors/shortcuts	Mike Greiling	2018-09-18	31	-33/+33
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move findAndFollowLink to lib/utils	Mike Greiling	2018-09-18	5	-5/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move GFM autocomplete setup, delete dispatcher	Mike Greiling	2018-09-14	4	-34/+21
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move shortcuts instantiation into behaviors	Mike Greiling	2018-09-14	3	-32/+37
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move performance_bar setup to dispatcher to main.js	Mike Greiling	2018-09-14	2	-8/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move search autocomplete from dispatcher to main.js	Mike Greiling	2018-09-14	4	-13/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move preview_markdown.js to behaviors	Mike Greiling	2018-09-14	3	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move initFieldErrors from dispatcher to main.js	Mike Greiling	2018-09-13	2	-8/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove superfluous import	Mike Greiling	2018-09-13	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move svg4everybody into polyfills and reorganize	Mike Greiling	2018-09-13	4	-12/+21
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'dz-combine-green-buttons' into 'master'	Filipa Lacerda	2018-09-19	142	-174/+168
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unite green buttons under one css class See merge request gitlab-org/gitlab-ce!21795