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	3	-52/+65
\| \| \| \| \| \| \| \| \| \| \|	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	5	-13/+43
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add time tracking information to Issue Boards sidebar Closes #31331 See merge request gitlab-org/gitlab-ce!27166
\| *	Add time tracking information to Issue Boards sidebar	Kushal Pandya	2019-04-12	5	-13/+43
\| \| \| \| \| \| \| \|	Add time tracking progress bar to Issue Boards sidebar.
* \|	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 ↵	Fatih Acet	2019-04-12	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	1	-1/+1
\| \| \|
* \| \|	Merge branch '11124-update-deployment-service-fails-if-project-is-nil' into ↵	Stan Hu	2019-04-12	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Always return the deployment in the UpdateDeploymentService#execute method Closes gitlab-ee#11124 See merge request gitlab-org/gitlab-ce!27322
\| * \| \|	Always return the deployment in the execute method	Douglas Barbosa Alexandre	2019-04-12	1	-0/+2
\| \| \| \|
* \| \| \|	Merge branch 'gt-fix-styling-for-framework-notes' into 'master'	Phil Hughes	2019-04-12	9	-19/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	9	-19/+19
\| \| \| \| \|
* \| \| \| \|	CE backport of Add Snowplow tracking to notes	Constance Okoghenun	2019-04-12	4	-0/+21
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bacport of Snowplow tracking for - Reply comment button - Start discussion and Comment buttons
* \| \| \|	Merge branch '60241-merge-request-popover-doesn-t-go-away-on-mouse-leave' ↵	Phil Hughes	2019-04-12	1	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a check to make sure eventListener is not added twice
* \| \| \| \|	Merge branch 'fe-remove-slugify' into 'master'	Filipa Lacerda	2019-04-12	1	-7/+0
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove slugify text utility See merge request gitlab-org/gitlab-ce!27290
\| * \| \| \|	Remove slugify text utilityfe-remove-slugify	Paul Slaughter	2019-04-12	1	-7/+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 'fix-typo-activity-lease' into 'master'	Stan Hu	2019-04-12	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Fix grouping wiki pages by directory	Igor	2019-04-12	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \|	Do not rescue errors from state transitions	Thong Kuah	2019-04-12	3	-19/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-9/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-9/+4
\| \|/ / /
* \| \| \|	Externalize strings in app/models	Martin Wortschack	2019-04-12	20	-95/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Update PO file
* \| \| \|	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 'diff-fluid-layout-fix' into 'master'	Kushal Pandya	2019-04-12	3	-2/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed fluid layout preference not being respected in diffs Closes #52916 See merge request gitlab-org/gitlab-ce!27302
\| * \| \|	Fixed fluid layout preference not being respected in diffs	Phil Hughes	2019-04-12	3	-2/+10
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
* \| \|	Merge branch '60261-save-btn-env' into 'master'	Kushal Pandya	2019-04-12	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes white background in the save button for environments Closes #60261 See merge request gitlab-org/gitlab-ce!27161
\| * \| \|	Updates Save button to have a green bg60261-save-btn-env	Filipa Lacerda	2019-04-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Save button in the environments create/edit form was white, it should be green.
* \| \| \|	Merge branch '60224-btn-env' into 'master'	Kushal Pandya	2019-04-12	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes extra btn class from dropdown Closes #60224 See merge request gitlab-org/gitlab-ce!27160
\| * \| \|	Removes extra btn class from dropdown60224-btn-env	Filipa Lacerda	2019-04-09	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	In the deployments page, the links inside a dropdown had an extra btn class
* \| \|	Merge branch '59896-builds-css' into 'master'	Phil Hughes	2019-04-12	5	-47/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes stylelint issues for builds.scss Closes #59896 See merge request gitlab-org/gitlab-ce!27279
\| * \| \|	Fixes stylelint issues for builds.scss59896-builds-css	Filipa Lacerda	2019-04-11	5	-47/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces CSS with utility classes Removes unused CSS
* \| \| \|	Merge branch 'remove-extend-fixed-width' into 'master'	Phil Hughes	2019-04-12	1	-8/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include fixed-width mixin instead of extending the class See merge request gitlab-org/gitlab-ce!27277
\| * \| \| \|	Include fixed-width mixin instead of extending the classremove-extend-fixed-width	Annabel Dunstone Gray	2019-04-11	1	-8/+3
\| \| \| \| \|
* \| \| \| \|	Squashed commits and modified visibility level output	Sara Ahbabou	2019-04-12	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added changelog and rebased
* \| \| \| \|	Merge branch ↵	Fatih Acet	2019-04-11	1	-1/+10
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'10015-move-ee-differences-for-app-assets-javascripts-boards-models-milestone-js' into 'master' Backport of "Move EE differences for `app/assets/javascripts/boards/models/milestone.js`" See merge request gitlab-org/gitlab-ce!27272
\| * \| \| \|	Backport of EE changes to board milestone model10015-move-ee-differences-for-app-assets-javascripts-boards-models-milestone-js	Constance Okoghenun	2019-04-11	1	-1/+10
\| \| \|/ / \| \|/\| \|
* \| \| \|	Update project settings qa selectors	Sanad Liaquat	2019-04-11	4	-29/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Additionally fixes geo rename test.
* \| \| \|	Improve project settings page	Luke Bennett	2019-04-11	10	-245/+253
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prioritize and simplify project settings content.
* \| \| \|	Merge branch '60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling' ↵	Annabel Dunstone Gray	2019-04-11	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Long file names in MR diffs cause horizontal scrolling" Closes #60304 See merge request gitlab-org/gitlab-ce!27233
\| * \| \|	Only make margin-auto on large screens for diff file header60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling	Sam Bigelow	2019-04-10	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'restore-hipchat' into 'master'	Nick Thomas	2019-04-11	3	-0/+313
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Remove HipChat integration from GitLab" Closes #60042 See merge request gitlab-org/gitlab-ce!27172
\| * \| \|	Revert "Remove HipChat integration from GitLab"	Sean McGivern	2019-04-10	3	-0/+313
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* \| \| \|	Merge branch 'fixed-web-ide-merge-request-review' into 'master'	Kushal Pandya	2019-04-11	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes Web IDE not loading merge request files Closes #60243 See merge request gitlab-org/gitlab-ce!27225
\| * \| \| \|	Fixes Web IDE not loading merge request files	Phil Hughes	2019-04-11	1	-0/+3
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60243
* \| \| \|	Merge branch 'revert-24704-download-repository-path' into 'master'	Rémy Coutable	2019-04-11	6	-35/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '24704-download-repository-path' into 'master'" See merge request gitlab-org/gitlab-ce!27249
\| * \| \| \|	Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-path	Patrick Bajao	2019-04-11	6	-35/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.