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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move to pdf.js distributed with npmleipert-move-pdf-js	Lukas Eipert	2019-05-10	2	-4/+4
\| \| \| \| \| \|	pdf.js is available on npm. Importing the dependency from there instead of vendoring it has certain benefits, e.g. the discoverability of updates (especially security fixes).
*	Merge branch ↵	Filipa Lacerda	2019-05-06	3	-50/+56
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'58105-pipeline-author-and-commit-author-too-close-together-in-pipeline-list' into 'master' Improve pipelines table spacing, add triggerer column Closes #38802 and #58105 See merge request gitlab-org/gitlab-ce!26136
\| *	Separate tests for triggerer component	mfluharty	2019-05-03	3	-50/+56
\| \|
* \|	Merge branch '59365-include-time-window-parameters-in-the-url-query-string' ↵	Fatih Acet	2019-05-03	1	-1/+36
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Include time window parameters in the URL query string" Closes #59365 See merge request gitlab-org/gitlab-ce!27230
\| * \|	Make time window parameters available in the query string59365-include-time-window-parameters-in-the-url-query-string	Jose Vargas	2019-05-01	1	-1/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds the frontend functionality to add the parameters via the `pushState` api, preventing the need for a page reload.
* \| \|	Merge branch 'expand-diff-performance' into 'master'	Filipa Lacerda	2019-05-03	4	-20/+181
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Impove the performance of expanding full diff Closes #58597 See merge request gitlab-org/gitlab-ce!27413
\| * \| \|	Impove the performance of expanding full diff	Phil Hughes	2019-05-03	4	-20/+181
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58597
* \| \|	Adds a way to start multiple manual jobs in stage	Mayra Cabrera	2019-05-02	2	-0/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adds an endpoint on PipelinesController - Adds a service that iterates over every build in a stage and plays it. - Includes 'play_manual' details on EntitySerializer - Builds a new Stage state: PlayManual. An stage can take this status if it has manual builds or an skipped, scheduled or manual status - Includes FE modifications and specs
* \| \|	Merge branch 'fix-ide-relative-url-bug' into 'master'	Phil Hughes	2019-05-02	1	-4/+15
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Fix IDE get file data with '/' as relative root See merge request gitlab-org/gitlab-ce!27911
\| * \|	Fix IDE get file data with '/' as relative rootfix-ide-relative-url-bug	Paul Slaughter	2019-04-30	1	-4/+15
\| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/60932
* \| \|	Extract discussion notes into new component	Paul Gascou-Vaillancourt	2019-05-01	2	-72/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Moved discussion notes out of `NoteableDiscussion` component into a new `DiscussionNotes` component - Wrote Jest tests for the new `DiscussionNotes` component - Updated Jest config for emojis fixtures - Updated Karma tests `NoteableDiscussion` to match its new structure - Convert `DiffDiscussions` tests to use Vue test utils
* \| \|	Merge branch 'winh-binary-fixture-path' into 'master'	Phil Hughes	2019-05-01	4	-4/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use FIXTURES_PATH constant for binary fixtures in frontend tests See merge request gitlab-org/gitlab-ce!27891
\| * \| \|	Use FIXTURES_PATH for loading test.pdf	Winnie Hellmann	2019-04-30	3	-3/+9
\| \| \| \|
\| * \| \|	Use FIXTURES_PATH in balsamiq_viewer_integration_spec.js	Winnie Hellmann	2019-04-30	1	-1/+3
\| \|/ /
* \| \|	Merge branch 'feat/sentry-environment' into 'master'	Douglas Barbosa Alexandre	2019-04-30	2	-10/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feat: add option to define the Sentry Environment See merge request gitlab-org/gitlab-ce!27091
\| * \| \|	feat: allow Sentry configuration to be passed on gitlab.yml	Roger Meier	2019-04-30	2	-10/+10
\| \|/ /
* \| \|	Merge branch 'refactor/58830-migrate-sidebar-spec-to-jest' into 'master'	Kushal Pandya	2019-04-30	13	-1044/+0
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactor(sidebar): Refactored shared sidebar component tests to Jest Closes #58830 See merge request gitlab-org/gitlab-ce!27688
\| * \|	refactor(sidebar): Refactored Karma spec files to Jest	Martin Hobert	2019-04-26	13	-1044/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #58830 Added changelog Updated to use jest functions Added mock implementation
* \| \|	Merge branch ↵	Ash McKenzie	2019-04-30	1	-1/+0
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian' into 'master' Delete leftover code for referenced_merge_requests endpoint Closes #60476 See merge request gitlab-org/gitlab-ce!27335
\| * \|	Delete leftover code for referenced_merge_requests60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian	Fatih Acet	2019-04-15	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We rewrote Related MRs widget using Vue. The previous implementation was using Haml templates and calling referenced_merge_requests endpoint which is now deprecated. This MR deletes leftover stuff them.
* \| \|	Merge branch 'winh-move-static-fixtures' into 'master'	Clement Ho	2019-04-26	8	-9/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move all static fixtures to static directory See merge request gitlab-org/gitlab-ce!27668
\| * \| \|	Move all static fixtures to static directory	Winnie Hellmann	2019-04-25	8	-9/+9
\| \| \| \|
* \| \| \|	Merge branch '60808-only-show-target-branch-advanced-error-before-merge' ↵	Filipa Lacerda	2019-04-26	1	-0/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Don't show the "target branch advanced" error message after merge Closes #60808 See merge request gitlab-org/gitlab-ce!27588
\| * \| \| \|	Only show message when MR is open60808-only-show-target-branch-advanced-error-before-merge	Nathan Friend	2019-04-24	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit fixes the bug that was causing the "target branch has "advanced" error message to display after an MR was closed.
* \| \| \| \|	Merge branch 'refactor/58827-migrate-issue-spec-to-jest' into 'master'	Kushal Pandya	2019-04-26	4	-597/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrated issue spec files to Jest Closes #58827 See merge request gitlab-org/gitlab-ce!27673
\| * \| \| \| \|	refactor(issue): Refactored issue tests from Karma to Jest	Martin Hobert	2019-04-25	4	-597/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	re #58827 Added changelog Added sync false, and removed unneeded destroyers
* \| \| \| \| \|	Merge branch 'migrate-import-projects-spec' into 'master'	Kushal Pandya	2019-04-26	4	-619/+0
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move import projects karma specs to jest Closes #60204 See merge request gitlab-org/gitlab-ce!27552
\| * \| \| \| \|	Move import projects karma specs to jest	Luke Bennett	2019-04-25	4	-619/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to the stability/validity of the specs.
* \| \| \| \| \|	test(Refactored notes tests from Karma to Jest):	Martin Hobert	2019-04-25	3	-137/+0
\| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #58829 Added changelog entry Added merge request id
* \| \| \| \|	Merge branch '60687-enviro-dropdown' into 'master'	Fatih Acet	2019-04-24	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Metrics environments dropdown Closes #60687 See merge request gitlab-org/gitlab-ce!27586
\| * \| \| \| \|	Fix Metrics environments dropdown60687-enviro-dropdown	Simon Knox	2019-04-24	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Also bring back EE dashboard component
* \| \| \| \|	Merge branch 'fix-api-ide-relative-url-root' into 'master'	Fatih Acet	2019-04-24	1	-1/+13
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix API and IDE path with `/` relative_url_root See merge request gitlab-org/gitlab-ce!27635
\| * \| \| \|	Fix API and IDE path with `/` relative_url_root	Paul Slaughter	2019-04-24	1	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? Previously we simply concatenated our paths, which led to requesting `//api/v4/...` and obviously failed. The BE supports a relative_url_root of `/`. It's a bug that the FE does not.
* \| \| \| \|	Merge branch '60387-use-icons-in-user-popovers' into 'master'	Tim Zallmann	2019-04-24	1	-0/+18
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show category icons in user popover Closes #60387 See merge request gitlab-org/gitlab-ce!27254
\| * \| \| \|	Show category icons in user popover	Kushal Pandya	2019-04-22	1	-0/+18
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Show bio, organization and location icons within user popover.
* \| \| \|	Create constants for IDE commit action values	Paul Slaughter	2019-04-24	2	-11/+13
\| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? These values will be used to help build the mirroring diff. It is helpful keeping it controlled in a constant. Links: - https://gitlab.com/gitlab-org/gitlab-ee/issues/10232 - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11478
* \| \|	Fix issue with list label text color	Tucker Chapman	2019-04-23	2	-0/+4
\| \| \|
* \| \|	Merge branch 'upgrade-to-rails-5-1' into 'master'	Rémy Coutable	2019-04-23	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Rails to 5.1 See merge request gitlab-org/gitlab-ce!27480
\| * \| \|	Upgrade Rails to 5.1.6.1	Jasper Maes	2019-04-23	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Model.new.attributes now also returns encrypted attributes.
* \| \|	Revert "Increased page size to 100"	Natalia Tepluhina	2019-04-23	1	-42/+12
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 2869a61f3b7aeb8b6d79c74332c93e32cec20caa.
* \| \|	Merge branch '59514-uploading-images-base64' into 'master'	Phil Hughes	2019-04-23	2	-0/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Web IDE uploading images shows base64 string" Closes #59514 See merge request gitlab-org/gitlab-ce!27471
\| * \| \|	Stores 'binary' and 'rawPath' attr after upload	Denys Mishunov	2019-04-18	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- When uploading a file, we need to flag binary files correspondingly so that it gets propagated all the way to RepoEditor as it decides on whether to show editor for this or that file or not (shouldHideEditor()) - rawPath needs to be propagate all the way to ContentViewer as well so that uploaded images could be rendered as a base64 image right away instead of raw base64 string
\| * \| \|	Passes file type down to ContentViewer	Denys Mishunov	2019-04-17	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of ContentViewer attempts to compute file type and render appropriate viewer type, compute it on the parent RepoEditor having all file-related information at its disposal and pass it down to ContentViewer as a prop
* \| \| \|	Make swipe view images line up	ftab	2019-04-23	1	-16/+0
\| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	If left without a width/height, swipeFrame goes off track when the image isn't wide enough to fill the available width. The spaceLeft prevented reaching the right edge of the image.
* \| \|	Merge branch '10502-board-list-spec-ce' into 'master'	Kushal Pandya	2019-04-19	2	-49/+60
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move EE specific testcase to EE spec file See merge request gitlab-org/gitlab-ce!27505
\| * \| \|	Move EE specific testcase to EE spec file	Rajat Jain	2019-04-19	2	-49/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor `board_list` such that we can reuse the parts of component creation with prop passing with ee specific spec.
* \| \| \|	Resolve cluster metrics regression	Adriel Santiago	2019-04-18	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes a regression causing cluster metrics not to display
* \| \| \|	Replace ee-specific code for boards/issue_card_inner	Roman Rodionov	2019-04-18	1	-0/+6
\| \|/ / \|/\| \|
* \| \|	Merge branch 'sh-add-gitaly-backtrace' into 'master'	Sean McGivern	2019-04-17	1	-7/+15
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add backtrace to Gitaly performance bar Closes #60092 See merge request gitlab-org/gitlab-ce!27345
\| * \| \|	Add backtrace to Gitaly performance bar	Stan Hu	2019-04-17	1	-7/+15
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds the backtrace to a table to show exactly where the Gitaly call was made to make it easier to understand where the call originated. This change also collapses the details in the same row to improve the usability when there is a backtrace.