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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Pin modals at 64px from the top of the viewportmf-modal-style-pin-position	mfluharty	2019-07-05	1	-2/+2
\| \| \| \|	Was 30px
*	Merge branch 'docs-kramdown-warnings-2' into 'master'	Evan Read	2019-07-04	21	-126/+123
\|\ \| \| \| \| \| \| \| \|	Docs: Fix markdown to reduce number of kramdown warnings (part 2) See merge request gitlab-org/gitlab-ce!30150
\| *	Small markdown tweaks to clear kramdown warnings	Marcel Amirault	2019-07-04	21	-126/+123
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing square brackets, links, etc in: merge_requests.md vulnerabilities.md issues.md issues_statistics.md pipelines.md services.md group_milestones.md milestones.md runners.md changelog.md issue_workflow.md elasticsearch.md api_graphql_styleguide.md automatic_ce_ee_merge.md file_storage.md architecture.md database_debugging.md index.md index.md frontend_testing.md pry_debugging.md vue.md development_process.md
*	Merge branch 'tc-fix-db-roulette' into 'master'	Mayra Cabrera	2019-07-04	3	-36/+23
\|\ \| \| \| \| \| \| \| \|	Fix reviewer roulette for DB reviews See merge request gitlab-org/gitlab-ce!30300
\| *	DRY up conditions for files require DB review	Toon Claes	2019-07-04	3	-36/+23
\|/ \| \| \| \| \| \| \|	Stop using two separate lists for the conditions which files require a database review. Related discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30156#note_187732053
*	Merge branch 'qa-increase-review-deploy-timeout' into 'master'	Lin Jen-Shin	2019-07-04	2	-24/+106
\|\ \| \| \| \| \| \| \| \|	[Review Apps] Add resource requests and limits to most of the chart resources See merge request gitlab-org/gitlab-ce!30155
\| *	Add resources requests and limits for all Review Apps resources	Rémy Coutable	2019-07-04	1	-23/+105
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Retry review-deploy only once	Rémy Coutable	2019-07-04	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'docs-ee-12592-ce-59847' into 'master'	Marcia Ramos	2019-07-04	3	-10/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Clarify project and repo size Closes gitlab-ee#12592 See merge request gitlab-org/gitlab-ce!30322
\| * \|	Docs: Clarify project and repo size	Cynthia Ng	2019-07-04	3	-10/+9
\|/ /
* \|	Merge branch 'doc-mj/definition-of-done' into 'master'	Marcia Ramos	2019-07-04	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Definition of done includes deployed change See merge request gitlab-org/gitlab-ce!30362
\| * \|	Definition of done includes deployed change	Marin Jankovski	2019-07-04	1	-0/+1
\| \| \|
* \| \|	Merge branch 'add-user-info-to-auth-logs-docs' into 'master'	Marcia Ramos	2019-07-04	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for new info on `auth.log` See merge request gitlab-org/gitlab-ce!30315
\| * \| \|	Add new info for auth.log	Mayra Cabrera	2019-07-04	1	-0/+3
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From 12.1, user information (id and username) are also included on auth.log. Documentation was updated to reflect this. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/62756
* \| \|	Merge branch 'fix-sidekiq-transaction-check-race' into 'master'	Nick Thomas	2019-07-04	2	-6/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix race in forbid_sidekiq_in_transactions.rb Closes #64088 See merge request gitlab-org/gitlab-ce!30359
\| * \| \|	Fix race in forbid_sidekiq_in_transactions.rbfix-sidekiq-transaction-check-race	Kamil Trzciński	2019-07-04	2	-6/+12
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Current code uses module attribute which stores value global instead of locally (thread locally). This results in concurrent accesses to overwrite the each other values
* \| \|	Merge branch 'mj/config-readme-diff' into 'master'	Achilleas Pipinellis	2019-07-04	1	-2/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove empty lines in config/README.md See merge request gitlab-org/gitlab-ce!30346
\| * \| \|	Remove empty lines in config/README.mdmj/config-readme-diff	Marin Jankovski	2019-07-04	1	-2/+1
\| \| \| \|
* \| \| \|	Merge branch '54117-transactional-rebase' into 'master'	Douglas Barbosa Alexandre	2019-07-04	15	-41/+191
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow asynchronous rebase operations to be monitored Closes #54117 See merge request gitlab-org/gitlab-ce!29940
\| * \| \|	Allow asynchronous rebase operations to be monitored	Nick Thomas	2019-07-04	14	-38/+188
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR introduces tracking of the `rebase_jid` for merge requests. As with `merge_ongoing?`, `rebase_in_progress?` will now return true if a rebase is proceeding in sidekiq. After one release, we should remove the Gitaly-based lookup of rebases. It is much better to track this kind of thing via the database.
\| * \| \|	Clarify documentation of Gitlab::SidekiqStatus	Nick Thomas	2019-07-04	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The "running" state is ambiguous. Clarify that it covers both enqueued and actually running jobs.
* \| \| \|	Merge branch '64079-aggregation-schedule-should-keep-lease-until-timeout' ↵	Rémy Coutable	2019-07-04	3	-15/+63
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Implements `lease_release?` on `NamespaceAggregation` Closes #64079 See merge request gitlab-org/gitlab-ce!30305
\| * \| \| \|	Implements lease_release on NamespaceAggregation	Mayra Cabrera	2019-07-04	3	-15/+63
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sets lease_release? to false to prevent the job to be re-executed more often than lease timeout Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64079
* \| \| \|	Merge branch 'update-todo-in-ui' into 'master'	Phil Hughes	2019-07-04	23	-142/+178
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change "Todo" to "To Do" in UI Closes #61501 See merge request gitlab-org/gitlab-ce!28844
\| * \| \| \|	Change 'Todo' to 'To Do'	Christie Lenneville	2019-07-04	23	-142/+178
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, we label items to be done as "Todo." This is grammatically incorrect and (therefore) confusing—especially to our Spanish-speaking users for whom "todo" has a specific and unrelated meaning. We should use "To Do" and always use it as singular (not "To Dos"). Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot
* \| \| \|	Merge branch '12556-flash-message' into 'master'	Phil Hughes	2019-07-04	1	-0/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for app/views/projects/_flash_messages.html.haml Closes gitlab-ee#12556 See merge request gitlab-org/gitlab-ce!30344
\| * \| \|	Removes EE differences12556-flash-message	Filipa Lacerda	2019-07-04	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch '12488-add-remove-parent-epic-quick-actions-doc-ce' into 'master'	Achilleas Pipinellis	2019-07-04	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation on quick actions for add/remove epic parent relations. See merge request gitlab-org/gitlab-ce!30174
\| * \| \| \|	Add documentation on quick actions for add/remove epic parent relations.	Eugenia Grieff	2019-07-04	1	-0/+2
\|/ / / /
* \| \| \|	Merge branch 'gitaly-version-v1.51.0' into 'master'	Douwe Maan	2019-07-04	2	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.51.0 See merge request gitlab-org/gitlab-ce!30353
\| * \| \| \|	Upgrade Gitaly to v1.51.0	GitalyBot	2019-07-04	2	-1/+6
\|/ / / /
* \| \| \|	Merge branch 'winh-move-BoardService-to-boardsStore' into 'master'	Fatih Acet	2019-07-04	5	-61/+138
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move BoardService logic to boardsStore Closes #61620 See merge request gitlab-org/gitlab-ce!29204
\| * \| \| \|	Copy content from BoardService to boardsStore	Winnie Hellmann	2019-07-04	5	-61/+138
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 813299edd83ace98256b7fc9302f586f0dc2cabc)
* \| \| \|	Merge branch 'winh-add-list-tabs-logic' into 'master'	Phil Hughes	2019-07-04	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move new list dropdown logic to new list dropdown (CE-backport) See merge request gitlab-org/gitlab-ce!30355
\| * \| \| \|	Create EE-specific initNewListDropdown() function	Winnie Hellmann	2019-07-04	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 844666193f0740ab9c5f91d60d61acb6ce14cfaf)
* \| \| \|	Merge branch 'docs-patch-73' into 'master'	Achilleas Pipinellis	2019-07-04	1	-2/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Omit Gitaly path where not needed, add where required See merge request gitlab-org/gitlab-ce!30241
\| * \| \| \|	Omit Gitaly path where not needed, add where required	Ben Bodenmiller	2019-07-04	1	-2/+4
\|/ / / /
* \| \| \|	Merge branch '12368-main-js' into 'master'	Phil Hughes	2019-07-04	2	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diff in main.js See merge request gitlab-org/gitlab-ce!30347
\| * \| \| \|	Resolve CE/EE diff in main.js12368-main-js	Lukas Eipert	2019-07-04	2	-0/+3
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moving ee/main.js to ee/main_ee.js allows to add a noop file in CE and utilize ee_else_ce.
* \| \| \|	Merge branch 'nfriend-make-haml-tooltip-delay-user-configurable' into 'master'	Fatih Acet	2019-07-04	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow vanilla JS tooltip delay to be customized through localStorage See merge request gitlab-org/gitlab-ce!30196
\| * \| \| \|	Allow (Haml) tooltip delay customization via localStoragenfriend-make-haml-tooltip-delay-user-configurable	Nathan Friend	2019-06-28	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'refactor-pipeline-errors_message-ce' into 'master'	Kamil Trzciński	2019-07-04	3	-1/+29
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port: Refactor pipeline errors_message See merge request gitlab-org/gitlab-ce!30116
\| * \| \| \| \|	Refactor pipeline errors_messagerefactor-pipeline-errors_message-ce	Shinya Maeda	2019-07-04	3	-1/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the shared method in Ci::Pipeline
* \| \| \| \| \|	Merge branch 'winh-boards-switcher-mounting' into 'master'	Kushal Pandya	2019-07-04	2	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract mounting of multiple boards switcher See merge request gitlab-org/gitlab-ce!30286
\| * \| \| \| \| \|	Extract mounting of multiple boards switcher	Winnie Hellmann	2019-07-04	2	-0/+5
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'qa-dequarantine-create-merge_request' into 'master'	Ramya Authappan	2019-07-04	1	-2/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing Quarantine tag for Create Closes gitlab-org/quality/staging#47 See merge request gitlab-org/gitlab-ce!30340
\| * \| \| \| \| \|	Removing Quarantine tag after testing	Tomislav Nikic	2019-07-04	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tested the two tests inside the suite, both passed and thus are being dequarantined.
* \| \| \| \| \| \|	Merge branch 'vue-i18n-js-sidebar-directory' into 'master'	Filipa Lacerda	2019-07-04	8	-29/+99
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vue-i18n: autofix for app/assets/javascripts/sidebar directory See merge request gitlab-org/gitlab-ce!30034
\| * \| \| \| \| \| \|	Vue-i18n: app/assets/javascripts/sidebar directory	Ezekiel Kigbo	2019-07-04	8	-29/+99
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/sidebar directory
* \| \| \| \| \| \|	Merge branch '63873-process-start-time' into 'master'	Douwe Maan	2019-07-04	6	-34/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "The process start time is invalid" Closes #63873 See merge request gitlab-org/gitlab-ce!30195