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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix shoulda-matchers in Rails 5jprovazn-rails5-shoulda	Jan Provaznik	2018-06-13	1	-0/+27
\| \| \| \| \|	Backports a fix for https://github.com/thoughtbot/shoulda-matchers/issues/913. This can be removed once new shoulda-matchers version is released.
*	Merge branch 'ide-job-loading-empty-state' into 'master'	Filipa Lacerda	2018-06-12	1	-0/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed IDE jobs empty state showing when loading Closes #47766 See merge request gitlab-org/gitlab-ce!19706
\| *	Fixed IDE jobs empty state showing when loadingide-job-loading-empty-state	Phil Hughes	2018-06-12	1	-0/+5
\| \| \| \| \| \| \| \|	Closes #47766
* \|	Merge branch 'pr-importer-io-extra-error-handling' into 'master'	Nick Thomas	2018-06-12	1	-0/+12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure MR diffs always exist in the PR importer Closes #47312 See merge request gitlab-org/gitlab-ce!19704
\| * \|	Ensure MR diffs always exist in the PR importerpr-importer-io-extra-error-handling	Yorick Peterse	2018-06-12	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In rare cases it could happen that an MR was created, but creating the MR diffs somehow failed (e.g. due to an error). This commit adds an additional check to make sure MR diffs are always present when importing GitHub pull requests.
* \| \|	Merge branch 'gitaly-disk-access-3' into 'master'	Douwe Maan	2018-06-12	23	-125/+214
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Find and mark more Git disk access locations, part 2 See merge request gitlab-org/gitlab-ce!19437
\| * \| \|	Find and mark more Git disk access locations, part 2	Jacob Vosmaer	2018-06-12	23	-125/+214
\| \| \| \|
* \| \| \|	mergeError message has been binded using v-html directive	Murat Dogan	2018-06-12	1	-4/+19
\| \| \| \|
* \| \| \|	Merge branch 'replace-dots-with-ellipsis' into 'master'	Annabel Gray	2018-06-12	3	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace ... with ellipsis in placeholders See merge request gitlab-org/gitlab-ce!19627
\| * \| \| \|	Replace ... with ellipsis in placeholdersreplace-dots-with-ellipsis	Andreas Kämmerle	2018-06-11	3	-4/+4
\| \| \| \| \|
* \| \| \| \|	Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter	Francisco Javier López	2018-06-12	1	-0/+16
\| \| \| \| \|
* \| \| \| \|	Merge branch 'expose-ci-url' into 'master'	Grzegorz Bizon \| off until 20th June	2018-06-12	2	-1/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CI_{PIPELINE,JOB}_URL See merge request gitlab-org/gitlab-ce!19618
\| * \| \| \| \|	Add CI_{PIPELINE,JOB}_URLexpose-ci-url	Kamil Trzciński	2018-06-12	2	-1/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Resolve "[Rails5] `ActionView::MissingTemplate` in ↵	blackst0ne	2018-06-12	1	-8/+12
\| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec/features/projects/wiki/user_views_wiki_page_spec.rb"
* \| \| \| \|	Merge branch 'da-port-cte-to-ce' into 'master'	Yorick Peterse	2018-06-12	1	-0/+42
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Gitlab::SQL:CTE for easily building CTE statements See merge request gitlab-org/gitlab-ce!19652
\| * \| \| \|	Add Gitlab::SQL:CTE for easily building CTE statements	Douglas Barbosa Alexandre	2018-06-11	1	-0/+42
\| \| \| \| \|
* \| \| \| \|	Merge branch 'bvl-fix-maintainer-push-rejected' into 'master'	Douwe Maan	2018-06-12	2	-0/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes rejected pushes from maintainers Closes #46337 See merge request gitlab-org/gitlab-ce!18968
\| * \| \| \| \|	Fixes rejected pushes from maintainersbvl-fix-maintainer-push-rejected	Bob Van Landuyt	2018-06-11	2	-0/+22
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before the push git would make a call to `/:namespace/:project/git-receive-pack`. This would perform an access check without a ref. So the `Project#branch_allows_maintainer_push?` would return false. This adjusts `Project#branch_allows_maintainer_push?` to return true when passing no branch name if there are merge requests open that would allow the user to push. The actual check then happens when a call to `/api/v4/internal/allowed` is made from a git hook.
* \| \| \| \|	Relax expectation in spec/models/project_spec.rb	Stan Hu	2018-06-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Multiple Sidekiq workers can run in the spec, causing `Project.find` to be run in different places. Instead of setting a fixed number of calls, just use `allow`.
* \| \| \| \|	Merge branch 'sh-expire-content-cache-after-import' into 'master'	Mayra Cabrera	2018-06-11	4	-11/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expire Wiki content cache after importing a repository Closes #47546 See merge request gitlab-org/gitlab-ce!19617
\| * \| \| \| \|	Fix Rubocop failure in spec/models/project_spec.rb	Stan Hu	2018-06-11	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Work around limitations of expect_any_instance_of by stubbing Project.find	Stan Hu	2018-06-11	3	-9/+23
\| \| \| \| \| \|
\| * \| \| \| \|	Expire Wiki content cache after importing a repository	Stan Hu	2018-06-11	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The cache state for Wikis that were imported via GitHub or Bitbucket does not appear to have been flushed after a successful import. Closes #47546
* \| \| \| \| \|	Merge branch 'jprovazn-rails5-boards' into 'master'	Rémy Coutable	2018-06-11	1	-6/+12
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Fix conversion of integer into string in board spec Closes #47653 See merge request gitlab-org/gitlab-ce!19616
\| * \| \| \| \|	Fix conversion of integer into string in board spec	Jan Provaznik	2018-06-09	1	-6/+12
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In rails 5 controller specs, integers are converted to strings unless conte-type is set with `as: :json`: https://github.com/rails/rails/issues/26069
* \| \| \| \|	Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'	Sean McGivern	2018-06-11	4	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Uploads specs are failing on master" Closes #47684 See merge request gitlab-org/gitlab-ce!19638
\| * \| \| \| \|	Don't use Rails.root.join for upload fixture paths	Rémy Coutable	2018-06-11	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'ide-etag-polling' into 'master'	Filipa Lacerda	2018-06-11	2	-22/+36
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix IDE pipelines eTagPoll not stopping Closes #47678 See merge request gitlab-org/gitlab-ce!19636
\| * \| \| \| \| \|	fixed specs	Phil Hughes	2018-06-11	1	-18/+29
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix IDE pipelines eTagPoll not stopping	Phil Hughes	2018-06-11	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #47678
* \| \| \| \| \| \|	Merge branch 'use-tooltip-component-in-mr-widget-author-time-component' into ↵	Filipa Lacerda	2018-06-11	2	-5/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Use Tooltip component in MrWidgetAuthorTime vue component See merge request gitlab-org/gitlab-ce!19635
\| * \| \| \| \| \| \|	Update MrWidgetAuthorTime and MRWidgetMerged spec	George Tsiolis	2018-06-11	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename MrWidgetAuthorTime vue component	George Tsiolis	2018-06-11	1	-3/+3
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Avoid checking the user format in every url validation	Francisco Javier López	2018-06-11	4	-21/+96
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Don't use Gitlab::Utils.nlbr in Gitlab::Git	Jacob Vosmaer (GitLab)	2018-06-11	9	-25/+41
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-update-rspec' into 'master'	Rémy Coutable	2018-06-11	43	-76/+72
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449
\| * \| \| \| \|	Correct more usages of non-relative `fixture_file_upload` paths	Robert Speicher	2018-06-07	8	-19/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Make all uses of `fixture_file_upload` use relative paths	Robert Speicher	2018-06-07	37	-58/+60
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dz-jupyter-use-nip-io' into 'master'	Grzegorz Bizon \| off until 20th June	2018-06-11	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use nip.io instead of xip.io for jupyter domain suggestion See merge request gitlab-org/gitlab-ce!19576
\| * \| \| \| \|	Use nip.io instead of xip.io for jupyter domain suggestion	Dmitriy Zaporozhets	2018-06-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'bvl-terms-on-registration' into 'master'	Robert Speicher	2018-06-08	4	-69/+118
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Users can accept terms during registration Closes gitlab-ee#6262 and #47621 See merge request gitlab-org/gitlab-ce!19583
\| * \| \| \| \| \|	Users can accept terms during registration	Bob Van Landuyt	2018-06-08	4	-69/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user checks the `accept` checkbox, we will track that acceptance as usual. That way they don't need to accept again after they complete the registration. When an unauthenticated user visits the `/-/users/terms` page, there is no button to accept, decline or continue. The 'current-user menu' is also hidden from the top bar.
* \| \| \| \| \| \|	Merge branch 'rs-schema-spec-parity' into 'master'	Nick Thomas	2018-06-08	1	-1/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor schema_spec.rb for CE-EE parity and simplicity See merge request gitlab-org/gitlab-ce!19563
\| * \| \| \| \| \|	Refactor schema_spec.rb for CE-EE parity and simplicity	Robert Speicher	2018-06-07	1	-1/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Revert rename allow collaboration column	Mark Chao	2018-06-08	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Resolve "Automatically created MR uses wrong target branch (when branching ↵	Athar Hameed	2018-06-08	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from Tag)"
* \| \| \| \| \| \|	Fix NotificationRecipientService spec for EE	Sean McGivern	2018-06-08	1	-3/+3
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE checks a license, which needs RequestStore enabled to avoid N+1 queries. However, enabling RequestStore causes Gitaly to complain about N+1 invocations, which we really don't care about here.
* \| \| \| \| \|	Merge branch 'improve-housekeeping-spec' into 'master'	Nick Thomas	2018-06-08	1	-31/+41
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes for Housekeeping Specs See merge request gitlab-org/gitlab-ce!18595
\| * \| \| \| \|	backport changes from gitlab-org/gitlab-ee!5461improve-housekeeping-spec	Gabriel Mazetto	2018-04-26	1	-31/+41
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '44331-upgrade-monaco-editor-and-remove-copywebpackplugin' into ↵2018-06-07-code-freeze-ee 2018-06-07-code-freeze	Tim Zallmann	2018-06-08	7	-82/+35
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Upgrade Monaco editor and remove CopyWebpackPlugin" Closes #44331 See merge request gitlab-org/gitlab-ce!17813