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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update vuex.md - swap PUT/POST methodspatch-38	Filipa Lacerda	2019-01-18	1	-2/+2
\|
*	Merge branch '56473-update-nginx-docs' into 'master'	Achilleas Pipinellis	2019-01-18	3	-13/+74
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for new NGINX Ingress metrics Closes #56473 See merge request gitlab-org/gitlab-ce!24449
\| *	Add documentation for new NGINX Ingress metrics	Joshua Lambert	2019-01-18	3	-13/+74
\|/
*	Merge branch 'ce-issue_7526' into 'master'	Fatih Acet	2019-01-18	4	-8/+18
\|\ \| \| \| \| \| \| \| \|	[EE Backport] Add notes filters for epics See merge request gitlab-org/gitlab-ce!24372
\| *	[EE Backport] Add notes filters for epics	Felipe Artur	2019-01-14	4	-8/+18
\| \|
* \|	Merge branch '30120-add-flat-square-badge-style' into 'master'	Grzegorz Bizon	2019-01-18	5	-4/+94
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add flat-square badge style Closes #30120 See merge request gitlab-org/gitlab-ce!24172
\| * \|	Add flat-square badge style	Fabian Schneider	2019-01-18	5	-4/+94
\|/ /
* \|	Merge branch 'qa-use-mr-iid-in-review-app-slug' into 'master'	Grzegorz Bizon	2019-01-18	2	-14/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use MR IID in Review Apps slug and domain See merge request gitlab-org/gitlab-ce!24388
\| * \|	Use MR IID in Review Apps slug and domain	Rémy Coutable	2019-01-15	2	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch ↵	Kushal Pandya	2019-01-18	2	-1/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'56328-frequent-items-initialisations-can-be-optimised-and-deferred-in-idlecallback' into 'master' Resolve "Frequent Items Initialisations can be optimised and deferred in idleCallback" Closes #56328 See merge request gitlab-org/gitlab-ce!24401
\| * \| \|	Changed function setup	Tim Zallmann	2019-01-18	1	-2/+2
\| \| \| \|
\| * \| \|	Fixed problem when element in main menu is not there (specs)	Tim Zallmann	2019-01-18	1	-1/+2
\| \| \| \|
\| * \| \|	Moves the Initialisation of the frequent Item Dropdowns to Idle Callback	Tim Zallmann	2019-01-16	2	-1/+10
\| \| \| \|
* \| \| \|	Merge branch 'an-dtracing-test-for-invalid-tracers' into 'master'	Kamil Trzciński	2019-01-18	3	-17/+48
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid overwriting default jaeger values with nil See merge request gitlab-org/gitlab-ce!24482
\| * \| \| \|	Avoid overwriting default jaeger values with nil	Andrew Newdigate	2019-01-18	3	-17/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	During the review process for adding opentracing factories, a bug was introduced which caused Jaeger to initialize an invalid tracer. The bug was due to use sending nil through as a kwarg when the Jaeger initializer used a non-nil default value. This is fairly insidious as, the tracer looks like a tracer, but, when methods are invoked, it throws `NoMethodError` errors. To ensure that this issue does not happen in future, the tests have been changed to ensure that the tracer works as expected. This could avoid problems in future when upgrading to newer versions of Jaeger.
* \| \| \| \|	Merge branch 'fix-runner-eternal-loop-when-update-job-result' into 'master'	Kamil Trzciński	2019-01-18	3	-1/+31
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix runner eternal loop when update job result Closes #56518 See merge request gitlab-org/gitlab-ce!24481
\| * \| \| \| \|	Fix runner eternal loop when update job result	Shinya Maeda	2019-01-18	3	-1/+31
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec Add changelog
* \| \| \| \|	Merge branch 'diff-tree-collapse-directories' into 'master'	Filipa Lacerda	2019-01-18	9	-8/+243
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Collapses directory structure in merge request tree Closes #53069 See merge request gitlab-org/gitlab-ce!24392
\| * \| \| \| \|	Added specs for mutations & utils methods	Phil Hughes	2019-01-16	2	-0/+141
\| \| \| \| \| \|
\| * \| \| \| \|	Collapses directory structure in merge request tree	Phil Hughes	2019-01-15	7	-8/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53069
* \| \| \| \| \|	Merge branch 'sh-bump-rbtrace-version' into 'master'	Rémy Coutable	2019-01-18	1	-5/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump rbtrace version to 0.4.11 See merge request gitlab-org/gitlab-ce!24476
\| * \| \| \| \|	Bump rbtrace version to 0.4.11	Stan Hu	2019-01-17	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change renames a dependency and fixes a minor bug, but this upgrade is happening because Gitaly will be receiving rbtrace as a dependency.
* \| \| \| \| \|	Merge branch '55544-port-upgrade-command' into 'master'	Kamil Trzciński	2019-01-18	4	-6/+126
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port generic Helm upgrade functionality to CE See merge request gitlab-org/gitlab-ce!23924
\| * \| \| \| \| \|	Refactor some methods in Prometheus model	Thong Kuah	2019-01-18	2	-14/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- #update_errored? method def is redundant, already defined from state machine - #update_in_progress? moved to ApplicationStatus - #ready_status becomes a constant. Previously it was extended in ee/ so maybe that was why it's a instance method
\| * \| \| \| \| \|	Port generic upgrade functionality to CE55544-port-upgrade-command	Thong Kuah	2019-01-15	3	-1/+128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port from EE generic upgrade related functionality used to upgrade Helm applications Remove memoization which could be incorrect It looks like we are memoizing without regard to the method's argument so this could result in an incorrect upgrade_command Remove `const_get` indirection now we are no longer in EE
* \| \| \| \| \| \|	Merge branch 'export-default-in-vuex-shared-modal-actions' into 'master'	Kushal Pandya	2019-01-18	1	-0/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Export default in vuex_shared/modal/actions See merge request gitlab-org/gitlab-ce!24435
\| * \| \| \| \| \| \|	Export default in vuex_shared/modal/actions	Paul Slaughter	2019-01-16	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? This prevents erros when using actions in karma test.
* \| \| \| \| \| \| \|	Merge branch 'user-avatar-list-empty-text' into 'master'	Kushal Pandya	2019-01-18	2	-15/+47
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle emptyText in user_avatar_list See merge request gitlab-org/gitlab-ce!24436
\| * \| \| \| \| \| \| \|	Handle emptyText in user_avatar_list	Paul Slaughter	2019-01-16	2	-15/+47
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? To reduce duplicate code, it's helpful to encapsulate this behavior here.
* \| \| \| \| \| \| \|	Merge branch 'patch-29' into 'master'	Evan Read	2019-01-18	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use CI variables in CI docker build examples See merge request gitlab-org/gitlab-ce!24130
\| * \| \| \| \| \| \|	Use CI variables in CI docker build examples	Siim Tiilen	2019-01-18	1	-3/+3
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'Projects--dropdown-is-misaligned-on-issue-boards-page' into ↵	Annabel Dunstone Gray	2019-01-17	5	-6/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Projects dropdown is misaligned on issue boards page Closes #48682 and #54920 See merge request gitlab-org/gitlab-ce!24277
\| * \| \| \| \| \| \|	fix misaligned projects dropdown	Johann Hubert Sonntagbauer	2019-01-17	5	-6/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* dropdown position * add empty state list overflow * avoid double scrollbars in project dropdown
* \| \| \| \| \| \| \|	Merge branch '55256-bs-spacer' into 'master'	Annabel Dunstone Gray	2019-01-17	1	-0/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spacer and spacers as overrides Closes #55256 See merge request gitlab-org/gitlab-ce!24459
\| * \| \| \| \| \| \| \|	Add spacer and spacers as overrides	Rajat Jain	2019-01-17	1	-0/+9
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'qa-grid-empty-check' into 'master'	Dan Davison	2019-01-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let QA_REMOTE_GRID be nil or empty string See merge request gitlab-org/gitlab-ce!24468
\| * \| \| \| \| \| \| \| \|	Let guard catch QA_REMOTE_GRID blank or nil	ddavison	2019-01-17	1	-1/+1
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'review-apps-do-not-exit-when-dependable-job-fails' into 'master'	Mark Lapierre	2019-01-17	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Review Apps] Don't exit when dependable job fails See merge request gitlab-org/gitlab-ce!24469
\| * \| \| \| \| \| \| \| \|	[Review Apps] Don't exit when dependable job fails	Rémy Coutable	2019-01-17	1	-1/+0
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The function that retrieves the dependable job is pretty basic and retrieves the first job found with the matching name, but this job can be failed but then successfully retried. In that case, we would exit the depending job even though the dependable job actually succeeded (the second time). Let's simplify things, be optimistic and continue with the depending job even if the dependable job fails. That reverts to the original behavior. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch '26375-markdown-footnotes-not-working' into 'master'	Lin Jen-Shin	2019-01-17	12	-21/+237
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Markdown footnotes not working Closes #26375 See merge request gitlab-org/gitlab-ce!24168
\| * \| \| \| \| \| \| \| \|	Bumping the CACHE_COMMONMARK_VERSION26375-markdown-footnotes-not-working	Brett Walker	2019-01-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the rendering of footnotes is changed, the cached html need to be updated
\| * \| \| \| \| \| \| \| \|	Update to nokogiri 1.10.1	Brett Walker	2019-01-17	4	-8/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactoring and addressing review comments	Brett Walker	2019-01-17	6	-47/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and additional spec
\| * \| \| \| \| \| \| \| \|	Updates based on review comments	Brett Walker	2019-01-10	3	-9/+16
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update nokogiri to 1.10.0	Brett Walker	2019-01-08	2	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and truncato to 0.7.11
\| * \| \| \| \| \| \| \| \|	Properly process footnotes in markdown	Brett Walker	2019-01-08	6	-3/+171
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All the ids and classes were stripped. Add them back in and make ids unique
* \| \| \| \| \| \| \| \| \|	Merge branch 'backup_restore_fix_issue_46891' into 'master'	Rémy Coutable	2019-01-17	2	-2/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modify file restore to rectify tar issue See merge request gitlab-org/gitlab-ce!24000
\| * \| \| \| \| \| \| \| \|	Modify file restore to rectify tar issue	Jason Colyer	2019-01-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed typo in run_pipeline! function -> Open3.pieline to Open3.pipeline
\| * \| \| \| \| \| \| \| \|	Modify file restore to rectify tar issue	Jason Colyer	2019-01-17	1	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjusted run_pipeline! function to match rubocop syntax requirements Adjusted run_pipeline! function to use variable instead of string interpolation
\| * \| \| \| \| \| \| \| \|	Modify file restore to rectify tar issue	Jason Colyer	2019-01-17	1	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed run_pipeline! function to have use $ in regex Changed run_pipeline! function to use Open3.pipeline instead of Open3.pipeline_start