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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Properly expire all pipeline caches when pipeline is deletedsh-fix-pipeline-delete-caching	Stan Hu	2019-04-15	6	-78/+134
\| \| \| \| \| \| \| \| \| \| \|	When deleting a pipeline, only some of the cache structures were being expired, but not the full pipeline list. We have to synchronously schedule a pipeline cache expiration because the pipeline will be deleted if the Sidekiq expiration job picks it up. To do this, properly extract all the logic buried in the Sidekiq worker into a service, and then call the service. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60469
*	Merge branch '31331-add-time-tracking-issue-boards-sidebar' into 'master'	Tim Zallmann	2019-04-12	7	-13/+63
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add time tracking information to Issue Boards sidebar Closes #31331 See merge request gitlab-org/gitlab-ce!27166
\| *	Add changelog entry31331-add-time-tracking-issue-boards-sidebar	Kushal Pandya	2019-04-12	1	-0/+5
\| \|
\| *	Add time tracking information to Issue Boards sidebar	Kushal Pandya	2019-04-12	6	-13/+58
\| \| \| \| \| \| \| \|	Add time tracking progress bar to Issue Boards sidebar.
* \|	Merge branch 'fix-protected_branches_spec-master' into 'master'60477-docs-feedback-emoji-pictures-are-broken	Michael Kozono	2019-04-12	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE Fix protected branch example failing on master See merge request gitlab-org/gitlab-ce!27332
\| * \|	Fix protected branch example failing on masterfix-protected_branches_spec-master	Luke Bennett	2019-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Failing due to updates in capybara and selenium driver.
* \| \|	Merge branch 'sh-revert-untrusted-chrome-repo' into 'master'	Douglas Barbosa Alexandre	2019-04-12	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Revert "Merge branch 'sh-allow-unauth-chrome' into 'master'" See merge request gitlab-org/gitlab-ce!27329
\| * \|	Revert "Merge branch 'sh-allow-unauth-chrome' into 'master'"sh-revert-untrusted-chrome-repo	Stan Hu	2019-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 026c92d5fa82fac87386d5691c3d5b1e02f2eb5e, reversing changes made to 8cda9d33a96e34c3809dcaddcde2619cc4923c0b.
* \| \|	Merge branch ↵	Fatih Acet	2019-04-12	2	-1/+15
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'60369-border-radius-still-showing-up-after-improve-diff-nav-header-was-finished' into 'master' Breakpoints.isDesktop should not always return false Closes #60369 See merge request gitlab-org/gitlab-ce!27240
\| * \| \|	Fix isDesktop function to return proper value	Sam Bigelow	2019-04-12	2	-1/+15
\| \| \| \|
* \| \| \|	Merge branch '11124-update-deployment-service-fails-if-project-is-nil' into ↵	Stan Hu	2019-04-12	3	-11/+33
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Always return the deployment in the UpdateDeploymentService#execute method Closes gitlab-ee#11124 See merge request gitlab-org/gitlab-ce!27322
\| * \| \|	Add CHANGELOG entry	Douglas Barbosa Alexandre	2019-04-12	1	-0/+5
\| \| \| \|
\| * \| \|	Always return the deployment in the execute method	Douglas Barbosa Alexandre	2019-04-12	2	-11/+28
\| \| \| \|
* \| \| \|	Merge branch 'add-to-docs-info-about-moving-migrations' into 'master'	Marcia Ramos	2019-04-12	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information about moving migrations See merge request gitlab-org/gitlab-ce!27159
\| * \| \| \|	Add information about moving migrations	Gosia Ksionek	2019-04-12	1	-0/+6
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add to docs paragraph about a way of moving EE migrations to CE if needed
* \| \| \|	Merge branch 'frozen_string_literal_spec_services' into 'master'	Michael Kozono	2019-04-12	233	-0/+466
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add frozen_string_literal to spec/services See merge request gitlab-org/gitlab-ce!27267
\| * \| \| \|	Add frozen_string_literal to spec/servicesfrozen_string_literal_spec_services	Thong Kuah	2019-04-12	233	-0/+466
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Probably useful as we often move these files to "new" files.
* \| \| \| \|	Merge branch 'gt-fix-styling-for-framework-notes' into 'master'	Phil Hughes	2019-04-12	10	-21/+21
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix styling for `app/assets/stylesheets/framework/notes.scss` Closes #59868 See merge request gitlab-org/gitlab-ce!26877
\| * \| \| \| \|	Rename selector for framework notes	George Tsiolis	2019-04-12	10	-21/+21
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Clement Ho	2019-04-12	5	-0/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'57318-track-discussion-thread-usage-on-gitlab-com-with-snowplow' into 'master' CE backport of Added Snowplow tracking to notes Closes #57318 See merge request gitlab-org/gitlab-ce!25899
\| * \| \| \| \| \|	CE backport of Add Snowplow tracking to notes	Constance Okoghenun	2019-04-12	5	-0/+27
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bacport of Snowplow tracking for - Reply comment button - Start discussion and Comment buttons
* \| \| \| \| \|	Merge branch 'docs-for-pages-inplace-chroot-limitation' into 'master'	Marcia Ramos	2019-04-12	1	-0/+4
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs for pages inplace chroot limitation See merge request gitlab-org/gitlab-ce!27250
\| * \| \| \| \|	Docs for pages inplace chroot limitationdocs-for-pages-inplace-chroot-limitation	Shinya Maeda	2019-04-11	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '60241-merge-request-popover-doesn-t-go-away-on-mouse-leave' ↵	Phil Hughes	2019-04-12	3	-1/+40
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Merge Request popover doesn't go away on mouse leave" Closes #60241 See merge request gitlab-org/gitlab-ce!27143
\| * \| \| \| \| \|	Fix bug where MR Popover wont go away60241-merge-request-popover-doesn-t-go-away-on-mouse-leave	Sam Bigelow	2019-04-12	3	-1/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a check to make sure eventListener is not added twice
* \| \| \| \| \| \|	Merge branch 'fe-remove-slugify' into 'master'	Filipa Lacerda	2019-04-12	2	-13/+0
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove slugify text utility See merge request gitlab-org/gitlab-ce!27290
\| * \| \| \| \| \|	Remove slugify text utilityfe-remove-slugify	Paul Slaughter	2019-04-12	2	-13/+0
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? This function was not being used and it's documentation was out of date.
* \| \| \| \| \|	Merge branch '59841-show-commits' into 'master'	Phil Hughes	2019-04-12	2	-6/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces CSS with utility class See merge request gitlab-org/gitlab-ce!27311
\| * \| \| \| \| \|	Replaces CSS with utility class59841-show-commits	Filipa Lacerda	2019-04-12	2	-6/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'update-capybara' into 'master'	Stan Hu	2019-04-12	7	-42/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update capybara and selenium-webdriver See merge request gitlab-org/gitlab-ce!27201
\| * \| \| \| \| \| \|	Also update nokogiri for QA	Lin Jen-Shin	2019-04-12	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix a few specs after updating capybara and selenium-webdriver	Rémy Coutable	2019-04-12	4	-27/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Update capybara and selenium-webdriver	Rémy Coutable	2019-04-12	2	-14/+14
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'fix-typo-activity-lease' into 'master'	Stan Hu	2019-04-12	2	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in activity lease See merge request gitlab-org/gitlab-ce!27288
\| * \| \| \| \| \|	Fix typo in activity leasefix-typo-activity-lease	Cindy Pallares	2019-04-11	2	-2/+2
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'id-undefined-pages-for-wiki-page' into 'master'	Douwe Maan	2019-04-12	2	-4/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grouping wiki pages by directory See merge request gitlab-org/gitlab-ce!27294
\| * \| \| \| \| \|	Fix grouping wiki pages by directory	Igor	2019-04-12	2	-4/+8
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a page has the same name as a directory the WikiPage#group_by_directory method can have a wrong behaviour This commit fixes it
* \| \| \| \| \|	Merge branch 'refactor_cluster_application_services' into 'master'	Kamil Trzciński	2019-04-12	6	-31/+42
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor cluster application services See merge request gitlab-org/gitlab-ce!27191
\| * \| \| \| \| \|	Do not rescue errors from state transitions	Thong Kuah	2019-04-12	6	-31/+42
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As this are un-expected errors which we should hear about from Sentry. Still rescue StandardError when operating a Helm action as we can get non Kubeclient errors such as SSL certificate or network errors
* \| \| \| \| \|	Merge branch '59925-reports' into 'master'	Phil Hughes	2019-04-12	1	-5/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes unused CSS in reports Closes #59925 See merge request gitlab-org/gitlab-ce!27310
\| * \| \| \| \| \|	Removes unused CSS	Filipa Lacerda	2019-04-12	1	-5/+0
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '59921-pipeline-schedule' into 'master'	Phil Hughes	2019-04-12	3	-9/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces CSS with BS4 utility class Closes #59921 See merge request gitlab-org/gitlab-ce!27309
\| * \| \| \| \| \|	Replaces CSS with BS4 utility class	Filipa Lacerda	2019-04-12	3	-9/+9
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'mw-i18n-app-models' into 'master'	Nick Thomas	2019-04-12	21	-95/+377
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings in app/models See merge request gitlab-org/gitlab-ce!27207
\| * \| \| \| \| \|	Externalize strings in app/models	Martin Wortschack	2019-04-12	21	-95/+377
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Update PO file
* \| \| \| \| \|	Merge branch 'pl-user-bot_type-ce' into 'master'	Sean McGivern	2019-04-12	1	-7/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport: Refactor Service Desk's bot user See merge request gitlab-org/gitlab-ce!26671
\| * \| \| \| \|	Remove User#internal_attributes method	Peter Leitzen	2019-04-12	1	-7/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's not needed anymore as we've replaced boolean `support_bot` with enum `bot_type`.
* \| \| \| \|	Merge branch 'enable_example_wording_cop' into 'master'	James Lopez	2019-04-12	4	-7/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable RSpec/ExampleWording cop See merge request gitlab-org/gitlab-ce!27187
\| * \| \| \| \|	Enable RSpec/ExampleWording cop	Thong Kuah	2019-04-12	4	-7/+9
\|/ / / / /
* \| \| \| \|	Merge branch 'diff-fluid-layout-fix' into 'master'	Kushal Pandya	2019-04-12	4	-2/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed fluid layout preference not being respected in diffs Closes #52916 See merge request gitlab-org/gitlab-ce!27302