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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch ↵	Filipa Lacerda	2018-02-22	1	-4/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation' into 'master' Resolve "Followup to New design for cancel/stop pipeline confirmation" Closes #42886 See merge request gitlab-org/gitlab-ce!17106
\| *	Merge branch 'master' into ↵42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation	Shah El-Rahman	2018-02-21	51	-367/+956
\| \|\ \| \| \| \| \| \| \| \| \|	42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation
\| * \	Merge branch 'master' into ↵	Shah El-Rahman	2018-02-16	1	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation
\| * \| \|	Remove use of callback in pipeline stop/retry modals	Shah El-Rahman	2018-02-16	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make changes to names of events and variables Combine stop and retry modals into 1 Fix lint issues Add comment about usage of eventHub instead of props
* \| \| \|	Merge branch 'ce-gitaly-squash-in-progress' into 'master'	Grzegorz Bizon	2018-02-22	1	-0/+26
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Incorporate Gitaly's RepositoryService.IsSquashInProgress RPC See merge request gitlab-org/gitlab-ce!17002
\| * \| \| \|	Incorporate Gitaly's RepositoryService.IsSquashInProgress RPCce-gitaly-squash-in-progress	Alejandro Rodríguez	2018-02-21	1	-0/+26
\| \| \| \| \|
* \| \| \| \|	Fix repo existence check in GitAccessWiki	Jacob Vosmaer (GitLab)	2018-02-22	3	-6/+18
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mk-improve-background-migration-specs' into 'master'	Stan Hu	2018-02-21	7	-365/+498
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve background migration specs See merge request gitlab-org/gitlab-ce!17162
\| * \| \| \|	Prefer `table` helper in migration specs	Michael Kozono	2018-02-20	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Move TrackUntrackedUploadsHelpers	Michael Kozono	2018-02-20	6	-132/+134
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into MigrationsHelpers namespace just for organization.
\| * \| \| \|	Explicitly reference redefined models	Michael Kozono	2018-02-20	2	-261/+262
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And move UntrackedFile into PopulateUntrackedUploadsDependencies, and move its spec into its own file.
\| * \| \| \|	Make :migration specs a little more robust	Michael Kozono	2018-02-16	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	E.g. https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/52873034
\| * \| \| \|	Remove more BG migration spec dependencies	Michael Kozono	2018-02-16	3	-17/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For the `PrepareUntrackedUploads` spec.
\| * \| \| \|	Remove codebase dependencies from a BG migration	Michael Kozono	2018-02-16	2	-106/+211
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specifically, `PopulateUntrackedUploads` and its spec.
* \| \| \| \|	Rest of Dispatcher Refactor	Jacob Schatz	2018-02-21	7	-133/+130
\| \| \| \| \|
* \| \| \| \|	#28481: Display time tracking totals on milestone page	Riccardo Padovani	2018-02-21	1	-6/+9
\| \| \| \| \|
* \| \| \| \|	Merge branch '36847-update-update-toml-rb-to-1.0.0' into 'master'	Rémy Coutable	2018-02-21	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "[Gem Update] update toml-rb to 1.0.0" Closes #36847 See merge request gitlab-org/gitlab-ce!17259
\| * \| \| \| \|	36847 - update toml-rb to 1.0.0	Ken	2018-02-21	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36847 - add changelog
* \| \| \| \| \|	Merge branch 'add-pagination-commit-diffs' into 'master'	Robert Speicher	2018-02-21	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing pagination on the commit diff endpoint Closes #43370 See merge request gitlab-org/gitlab-ce!17203
\| * \| \| \| \| \|	Add missing pagination on the commit diff endpoint	Maxime Roussin-Belanger	2018-02-19	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '26039-Update-to-github-linguist5.3.x' into 'master'	Robert Speicher	2018-02-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update to github-linguist 5.3.x" Closes #26039 See merge request gitlab-org/gitlab-ce!17241
\| * \| \| \| \| \| \|	26039 - update github-linguist to 5.3.3 version	Ken	2018-02-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	26039 - add merge request id 26039 change due to lingust source file updates
* \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-02-21	1	-1/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40668-pages-domain-api-returns-404-when-using-a-specific-domain' into 'master' Resolve "Pages Domain API returns 404 when using a specific domain" Closes #40668 See merge request gitlab-org/gitlab-ce!17206
\| * \| \| \| \| \| \| \|	Fix get a single pages domain when project path contains a period	Travis Miller	2018-02-19	1	-1/+12
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'refactor-issuable-finder-to-use-inheritance' into 'master'	Rémy Coutable	2018-02-21	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor IssuableFinder to extract model-specific logic See merge request gitlab-org/gitlab-ce!17236
\| * \| \| \| \| \| \| \| \|	Refactor IssuableFinder to extract model-specific logicrefactor-issuable-finder-to-use-inheritance	Sean McGivern	2018-02-21	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By extracting a new `filter_items` method, we can override that in the IssuesFinder and MergeRequestsFinder separately, so we don't need checks that the model is the correct one, because we can just use the class we're in to know that. We can do the same for the VALID_PARAMS constant, by making it a class method.
* \| \| \| \| \| \| \| \| \|	Merge branch 'ce-3776-ci-view-for-sast' into 'master'	Phil Hughes	2018-02-21	2	-2/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18n See merge request gitlab-org/gitlab-ce!17176
\| * \| \| \| \| \| \| \| \| \|	CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18nce-3776-ci-view-for-sast	Filipa Lacerda	2018-02-20	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport common class name for the tab content Backport more changes
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'move-project-pages-to-rspec' into 'master'	Rémy Coutable	2018-02-21	1	-2/+202
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move project pages spinach tests to Rspec See merge request gitlab-org/gitlab-ce!17256
\| * \| \| \| \| \| \| \| \| \| \|	Move project pages spinach tests to Rspec	Semyon Pupkov	2018-02-21	1	-2/+202
\| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \| \| \| \| \| \| \|	Do not count rails sql cache as queries in query limitingquery-counting-should-not-include-cached-queries	Dylan Griffith	2018-02-21	1	-8/+23
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Update to jQuery 3.	Jacob Schatz	2018-02-20	11	-34/+51
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add unit tests for Gitaly typeszj-unit-test-gitaly-arrays	Zeger-Jan van de Weg	2018-02-20	2	-0/+5
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'move-spintach-project-network-graph-to-rspec' into 'master'	Rémy Coutable	2018-02-20	1	-0/+108
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move spinach project network graph tests to RSpec See merge request gitlab-org/gitlab-ce!17171
\| * \| \| \| \| \| \|	Move spinach project network graph tests to RSpec	Semyon Pupkov	2018-02-16	1	-0/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \| \| \| \|	Merge branch 'remove-chart-show-bundle' into 'master'	Phil Hughes	2018-02-20	3	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove graphs_show.js webpack bundle See merge request gitlab-org/gitlab-ce!17194
\| * \| \| \| \| \| \| \|	fix broken specsremove-chart-show-bundle	Mike Greiling	2018-02-19	3	-4/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove extraneous tests from Issues API specrs-over-testing	Robert Speicher	2018-02-19	2	-50/+2
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These were all testing an implementation detail of `Issues::UpdateService` which is already well-tested and doesn't need to be re-tested here. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25201
* \| \| \| \| \| \| \|	[GH Import] Create an empty wiki if wiki import failed	Valery Sizov	2018-02-19	1	-2/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Resolve "group request membership mail with too long list of "To:""	🙈 jacopo beschi 🙉	2018-02-19	2	-68/+91
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'	Sean McGivern	2018-02-19	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid slow File Lock checks when not used Closes #43339 See merge request gitlab-org/gitlab-ce!17140
\| * \| \| \| \| \| \| \|	Avoid slow File Lock checks when not used	James Edwards-Jones	2018-02-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also avoid double commit lookup during file lock check by reusing memoized commits.
* \| \| \| \| \| \| \| \|	Merge branch '32564-fix-double-system-closing-notes' into 'master'	Sean McGivern	2018-02-19	1	-13/+36
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Double closing system notes when closing issue with Merge Request" Closes #32546 and #32564 See merge request gitlab-org/gitlab-ce!17035
\| * \| \| \| \| \| \| \| \|	applying feedback32564-fix-double-system-closing-notes	Micaël Bergeron	2018-02-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# modified: lib/gitlab/git/commit.rb
\| * \| \| \| \| \| \| \| \|	fix specs	Micaël Bergeron	2018-02-16	1	-13/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	stop ProcessCommitWorker from processing MR merge commit	Micaël Bergeron	2018-02-16	1	-6/+32
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a merge request is merged, it creates a commit with the description of the MR, which may contain references and issue closing references. As this will be handled in the PostMergeService anyways, let's ignore merge commit generated from a MR.
* \| \| \| \| \| \| \| \|	Merge branch 'sh-guard-read-only-user-updates' into 'master'	Nick Thomas	2018-02-19	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't attempt to update user tracked fields if database is in read-only Closes gitlab-ee#4972 See merge request gitlab-org/gitlab-ce!17200
\| * \| \| \| \| \| \| \| \|	Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updates	Stan Hu	2018-02-17	1	-0/+8
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With Geo, attempting to view an endpoint with a user could result in an Error 500 since Devise attempts to update the last sign-in IP and other details. Closes gitlab-org/gitlab-ee#4972
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'	Sean McGivern	2018-02-19	1	-0/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix squash rebase not working when diff contained encoded data Closes gitlab-ee#4960 See merge request gitlab-org/gitlab-ce!17205
\| * \| \| \| \| \| \| \| \|	Fix squash rebase not working when diff contained encoded datash-fix-squash-rebase-utf8-data	Stan Hu	2018-02-18	1	-0/+12
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the applied diff contains UTF-8 or some other encoded data, the diff returned back from the git process may be in ASCII-8BIT format. Writing this data to stdin may fail if the data because stdin expects this data to be in UTF-8. By switching the output to binmode, we ensure that the diff will always be written as-is. Closes gitlab-org/gitlab-ee#4960