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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Delete static_fixtures.rb for static HAML fixtures	Winnie Hellmann	2019-04-11	3	-30/+15
\|
*	Merge branch 'gt-fix-styling-for-pages-import' into 'master'	Phil Hughes	2019-04-11	2	-3/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix styling for `app/assets/stylesheets/pages/detail_page.scss` Closes #59909 See merge request gitlab-org/gitlab-ce!26873
\| *	Replace properties with utility class	George Tsiolis	2019-04-10	2	-3/+1
\| \|
* \|	Merge branch ↵	Sean McGivern	2019-04-11	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'3353-trainee-backend-maintainer-ash-mckenzie-update-codeowners' into 'master' Add @ashmckenzie to backend CODEOWNERS Closes gitlab-com/www-gitlab-com#3353 See merge request gitlab-org/gitlab-ce!27204
\| * \|	Add @ashmckenzie to backend CODEOWNERS3353-trainee-backend-maintainer-ash-mckenzie-update-codeowners	Ash McKenzie	2019-04-10	1	-2/+2
\| \| \|
* \| \|	Merge branch ↵	Kushal Pandya	2019-04-11	1	-3/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'10017-move-ee-differences-for-app-assets-javascripts-boards-models-list-js' into 'master' Backport of Resolve "Move EE differences for `app/assets/javascripts/boards/models/list.js`" See merge request gitlab-org/gitlab-ce!27198
\| * \| \|	Backported changes from EE for board list model10017-move-ee-differences-for-app-assets-javascripts-boards-models-list-js	Constance Okoghenun	2019-04-10	1	-3/+16
\| \| \| \|
* \| \| \|	Merge branch ↵	Kushal Pandya	2019-04-11	1	-1/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'10016-move-ee-differences-for-app-assets-javascripts-boards-models-issue-js' into 'master' Backport of "Move EE differences for `app/assets/javascripts/boards/models/issue.js`" See merge request gitlab-org/gitlab-ce!27197
\| * \| \| \|	Backported changes from EE for board issue model10016-move-ee-differences-for-app-assets-javascripts-boards-models-issue-js	Constance Okoghenun	2019-04-10	1	-1/+15
\| \|/ / /
* \| \| \|	Merge branch 'fix/url_validator_' into 'master'	James Lopez	2019-04-11	21	-172/+292
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align UrlValidator to validate_url gem implementation See merge request gitlab-org/gitlab-ce!27194
\| * \| \| \|	Align UrlValidator to validate_url gem implementation.	Thong Kuah	2019-04-11	21	-172/+292
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renamed UrlValidator to AddressableUrlValidator to avoid 'url:' naming collision with ActiveModel::Validations::UrlValidator in 'validates' statement. Make use of the options attribute of the parent class ActiveModel::EachValidator. Add more options: allow_nil, allow_blank, message. Renamed 'protocols' option to 'schemes' to match the option naming from UrlValidator.
* \| \| \|	Merge branch 'patch-15' into 'master'	Evan Read	2019-04-11	1	-4/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ci/yaml: add version info to changes only/except See merge request gitlab-org/gitlab-ce!24062
\| * \| \| \|	ci/yaml: add version info to changes only/except	Elan Ruusamäe	2019-04-11	1	-4/+9
\|/ / / /
* \| \| \|	Merge branch 'vzagorodny-clarify-shell-cmds-link-title-ce' into 'master'	Evan Read	2019-04-11	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify "Shell commands" link title in style guide doc See merge request gitlab-org/gitlab-ce!27241
\| * \| \| \|	Clarify "Shell commands" link title in style guide doc	Victor Zagorodny	2019-04-11	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch '60164-docs-feedback-write-your-title' into 'master'	Evan Read	2019-04-10	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Time Tracking feature link Closes #60164 See merge request gitlab-org/gitlab-ce!27211
\| * \| \| \|	Update Time Tracking feature link60164-docs-feedback-write-your-title	Mark Fletcher	2019-04-10	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-fix-docs-lint-ci' into 'master'	Douglas Barbosa Alexandre	2019-04-10	3	-0/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove executable bits from documentation images See merge request gitlab-org/gitlab-ce!27242
\| * \| \| \| \|	Remove executable bits from documentation images	Stan Hu	2019-04-10	3	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The build in https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/194484356 was failing.
* \| \| \| \| \|	Merge branch 'tz-revert-new-emojis-loading' into 'master'	Stan Hu	2019-04-10	1809	-11111/+183
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'tz-reorganise-digests-json' into 'master'" See merge request gitlab-org/gitlab-ce!26156
\| * \| \| \| \|	Removed also the in the meanwhile introduced rake task	Tim Zallmann	2019-04-10	1	-9/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"tz-revert-new-emojis-loading	Tim Zallmann	2019-04-10	1808	-11102/+182
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reverts the loading of emojis and its images to move forward with RC
* \| \| \| \| \|	Merge branch 'sh-disable-diff-instrumentation' into 'master'	Michael Kozono	2019-04-10	2	-1/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable method instrumentation for diffs Closes #52898 See merge request gitlab-org/gitlab-ce!27235
\| * \| \| \| \|	Disable method instrumentation for diffs	Stan Hu	2019-04-10	2	-1/+5
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When there a large number of discussions on diffs, the instrumentation has a significant impact on performance since it's often run in a tight loop for line position calculation etc. We should disable this since there are other ways to benchmark performance. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52898
* \| \| \| \|	Merge branch 'ce-10834-support-fast-unit-tests-in-ee' into 'master'	Rémy Coutable	2019-04-10	3	-0/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Resolve "Support fast unit tests in EE" See merge request gitlab-org/gitlab-ce!26861
\| * \| \| \| \|	Require possible EE extension	Lin Jen-Shin	2019-04-10	2	-0/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Add a test for fast_spec_helper	Lin Jen-Shin	2019-04-10	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'update-issue_workflow-docs' into 'master'	Achilleas Pipinellis	2019-04-10	2	-2/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing team and stage labels in the workflow labels doc See merge request gitlab-org/gitlab-ce!27224
\| * \| \| \| \| \|	Add missing team and stage labels in the workflow labels doc	Rémy Coutable	2019-04-10	2	-2/+6
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'quarantine-flaky-specs' into 'master'	Douglas Barbosa Alexandre	2019-04-10	4	-4/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine flaky specs See merge request gitlab-org/gitlab-ce!27222
\| * \| \| \| \|	Quarantine flaky specsquarantine-flaky-specs	Rémy Coutable	2019-04-10	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge remote-tracking branch 'origin/master'	John T Skarbek	2019-04-10	26	-57/+125
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Merge branch 'patch-49' into 'master'	Nick Thomas	2019-04-10	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change reason for waiting See merge request gitlab-org/gitlab-ce!26607
\| \| * \| \| \| \|	Change reason for waiting	Raphael Das Gupta	2019-04-10	1	-1/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apparently one has to wait, but DNS can't be involved at this step. (As the DNS records had already to be ready and presumably propagated for the ACME challenge to work.) So let's assume it's the content delivery network serving the certificate that needs some time here.
\| * \| \| \| \|	Merge branch 'docs-fix-bin-qa-command' into 'master'	Ramya Authappan	2019-04-10	1	-8/+10
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 'bundle exec' to the 'bin/qa' calls in qa/README.md See merge request gitlab-org/gitlab-ce!27169
\| \| * \| \| \| \|	Add 'bundle exec' to the 'bin/qa' calls in qa/README.mddocs-fix-bin-qa-command	Rémy Coutable	2019-04-09	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Merge branch 'tp-2019-04-08-quarantine' into 'master'	Ramya Authappan	2019-04-10	2	-3/+4
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine failing nightly tests See merge request gitlab-org/gitlab-ce!27174
\| \| * \| \| \| \|	Quarantine failing nightly teststp-2019-04-08-quarantine	Tanya Pazitny	2019-04-09	2	-3/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'update-workhorse-8-5-1' into 'master'	Sean McGivern	2019-04-10	2	-1/+6
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Workhorse to v8.5.1 See merge request gitlab-org/gitlab-ce!27217
\| \| * \| \| \| \|	Update GitLab Workhorse to v8.5.1	Nick Thomas	2019-04-10	2	-1/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'mw-i18n-app-workers' into 'master'	Kamil Trzciński	2019-04-10	4	-16/+67
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings in app/workers See merge request gitlab-org/gitlab-ce!27181
\| \| * \| \| \| \| \|	Externalize strings in app/workers	Martin Wortschack	2019-04-10	4	-16/+67
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- email_receiver_worker - object_storage/migrate_uploads_worker - Update PO file
\| * \| \| \| \| \|	Merge branch 'winh-jest-valid-describe' into 'master'	Kushal Pandya	2019-04-10	7	-18/+13
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable ESLint rule jest/valid-describe See merge request gitlab-org/gitlab-ce!27140
\| \| * \| \| \| \|	Wrap modal mutation names in template stringswinh-jest-valid-describe	Winnie Hellmann	2019-04-10	1	-3/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Hard code test name in timeline_entry_item_spec.js	Winnie Hellmann	2019-04-10	2	-7/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Hard code test name in suggestion_diff_row_spec.js	Winnie Hellmann	2019-04-10	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Wrap import project mutation names in template strings	Winnie Hellmann	2019-04-10	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Wrap file template mutation names in template strings	Winnie Hellmann	2019-04-10	1	-5/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Enable ESLint rule jest/valid-describe	Winnie Hellmann	2019-04-10	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'dz-patch-50' into 'master'	Lin Jen-Shin	2019-04-10	1	-1/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add doc link to omnibus for changing gitlab.yml See merge request gitlab-org/gitlab-ce!27216