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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Enable mapping to nil in enumsrails5-enum-nil	Jan Provaznik	2018-05-31	3	-21/+36
\| \| \| \| \| \| \| \| \| \| \| \|	Enum in Rails 5 does not map nil values - IOW nil value remains nil, even if there is a key with nil value in the enum definition. This commit overrides the underlying Enum methods so nil value is still mapped. This solution is far from being ideal: it uses dynamic definition of methods which introduces more magic/confusion into the codebase. It would be better to get rid of the nil value in enums.
*	Fix snippets embed form	Clement Ho	2018-05-31	2	-21/+5
\|
*	Merge branch '46552-fixes-redundant-message-for-failure-reasons' into 'master'	Grzegorz Bizon	2018-05-31	2	-3/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixes redudant script failure message Closes #46552 and #44271 See merge request gitlab-org/gitlab-ce!19138
\| *	Moves script_failure conditional over lambda46552-fixes-redundant-message-for-failure-reasons	Mayra Cabrera	2018-05-30	1	-2/+2
\| \| \| \| \| \| \| \|	So the 'failed' message can actually indicate if the build failed or not
\| *	Removes redundant error message for script failures	Mayra Cabrera	2018-05-24	2	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Script failure message was redundant so it was removed. Also 'check your job log' message was removed from all the error messages. Closes #44271
* \|	Merge branch '41587-osw-mr-metrics-migration-take-two' into 'master'	Grzegorz Bizon	2018-05-31	3	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Take two for MR metrics population background migration See merge request gitlab-org/gitlab-ce!19097
\| * \|	Ensure metrics regardless of being imported on MRs41587-osw-mr-metrics-migration-take-two	Oswaldo Ferreira	2018-05-30	3	-2/+2
\| \| \|
* \| \|	Fix active tab styling	Annabel Gray	2018-05-31	4	-22/+32
\| \| \|
* \| \|	Export assigned issues in iCalendar feed	Imre Farkas	2018-05-31	18	-32/+93
\| \| \|
* \| \|	Merge branch 'rails5-exists-query' into 'master'	Yorick Peterse	2018-05-31	1	-5/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace `.exists` with `EXISTS ()` Closes #46277 See merge request gitlab-org/gitlab-ce!19178
\| * \| \|	Replace `.exists` with `EXISTS ()`	Jan Provaznik	2018-05-28	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`.exists` should not be used because it's an internal ActiveRecord method, but we can easily generate the same sql query with `EXISTS`.
* \| \| \|	Resolve "Remove links from Web IDE unexpectedly navigate you to a different ↵	Sam Beckham	2018-05-31	3	-87/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	page"
* \| \| \|	Cleanup code for General Project Settings	Lukas Eipert	2018-05-31	5	-41/+49
\| \| \| \|
* \| \| \|	Merge branch '46903-osw-fix-permitted-params-filtering-on-merge-scheduling' ↵	Sean McGivern	2018-05-31	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Adjust permitted params filtering on merge scheduling Closes #46903 See merge request gitlab-org/gitlab-ce!19255
\| * \| \| \|	Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-scheduling	Oswaldo Ferreira	2018-05-30	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fj-36819-remove-v3-api' into 'master'	Douwe Maan	2018-05-31	2	-12/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removal of API v3 from the codebase Closes #36819 See merge request gitlab-org/gitlab-ce!18970
\| * \| \| \| \|	Removed API endpoint and specsfj-36819-remove-v3-api	Francisco Javier López	2018-05-30	2	-12/+1
\| \|/ / / /
* \| \| \| \|	Merge branch '46971-extra-whitespace' into 'master'	Phil Hughes	2018-05-31	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Extra whitespace when hovering commit sha in MR widget" Closes #46971 See merge request gitlab-org/gitlab-ce!19267
\| * \ \ \ \	Merge branch 'master' into 46971-extra-whitespace	Filipa Lacerda	2018-05-31	32	-252/+236
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (32 commits) Update CHANGELOG.md for 10.8.3 Update "col-xs" usage to bootstrap4 Add missing usage_ping_enabled to API settings Make Repository#blob_data_at a public method Fix UI broken in line profiling modal due to Bootstrap 4 Only preload member records for the relevant projects/groups/user in projects API Fix   after sign-in with Google button Fix a wrong link reference in docs Simplify spec: `2.times.each` -> `2.times` Replace grape-route-helpers with our own grape-path-helpers Add archived param to the json response Consider we might have prefix for stable branches Convert spec/javascripts/.eslintrc to yml format as well Remove version lock on awesome_print dependency Fix import project by url layout Fix missing timeout value in object storage pre-authorization call fix last lints disable no-multi-assign fix `spaced-comment` remove unused createComponentWithMixin from vue spec helpers ...
\| * \| \| \| \| \|	Remove whitespace	Filipa Lacerda	2018-05-30	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dm-relative-url-root-in-development' into 'master'	Rémy Coutable	2018-05-31	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix various bugs related to relative_url_root in development See merge request gitlab-org/gitlab-ce!19213
\| * \| \| \| \| \|	Fix various bugs related to relative_url_root in development	Douwe Maan	2018-05-29	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update "col-xs" usage to bootstrap4	Paul Slaughter	2018-05-30	3	-6/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-move-blob-data-at-public' into 'master'	Robert Speicher	2018-05-30	1	-8/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Repository#blob_data_at a public method See merge request gitlab-org/gitlab-ce!19259
\| * \| \| \| \| \| \|	Make Repository#blob_data_at a public method	Stan Hu	2018-05-30	1	-8/+8
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reduces conflicts with EE, where it is public because it is called in ee/lib/gitlab/ci/external/file/local.rb.
* \| \| \| \| \| \|	Merge branch 'fix-nbsp-after-sign-in-with-google' into 'master'	Filipa Lacerda	2018-05-30	1	-2/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix   after sign-in with Google button Closes #45551 See merge request gitlab-org/gitlab-ce!19249
\| * \| \| \| \| \| \|	Fix   after sign-in with Google buttonfix-nbsp-after-sign-in-with-google	Kamil Trzciński	2018-05-30	1	-2/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'leipert-upgrade-eslint' into 'master'	Mike Greiling	2018-05-30	18	-161/+120
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade eslint 3 -> 4 Closes #40476 See merge request gitlab-org/gitlab-ce!19182
\| * \| \| \| \| \| \| \|	fix `spaced-comment`	Lukas Eipert	2018-05-29	7	-12/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix `no-unused-vars`	Lukas Eipert	2018-05-29	11	-152/+109
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Upgrade to eslint `~4.12.1` which is the last known version where the ↵	Lukas Eipert	2018-05-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	camelcase bug does not persist
* \| \| \| \| \| \| \| \|	Merge branch '46999-line-profiling-modal-width' into 'master'	Clement Ho	2018-05-30	1	-6/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Line profiling modal width Closes #46999 See merge request gitlab-org/gitlab-ce!19253
\| * \| \| \| \| \| \| \|	Fix UI broken in line profiling modal due to Bootstrap 4	Takuya Noguchi	2018-05-31	1	-6/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '46879-import-project-alignment' into 'master'	Clement Ho	2018-05-30	4	-65/+63
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "BS4: Import project page is missing margins and wells" Closes #46879 See merge request gitlab-org/gitlab-ce!19215
\| * \| \| \| \| \| \| \|	Fix import project by url layout	Annabel Dunstone Gray	2018-05-29	4	-65/+63
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2018-05-30	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'46917-gitlab-is-not-sending-objectstore-timeout-value-to-workhorse' into 'master' Resolve "gitlab is not sending ObjectStore timeout value to workhorse" Closes #46917 See merge request gitlab-org/gitlab-ce!19201
\| * \| \| \| \| \| \| \| \|	Fix missing timeout value in object storage pre-authorization call	Alessio Caiazza	2018-05-29	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-group-shared-projects-private-api' into 'master'	Sean McGivern	2018-05-30	2	-1/+32
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `shared_projects` endpoint Closes #46800 See merge request gitlab-org/gitlab-ce!19141
\| * \| \| \| \| \| \| \| \| \|	Add archived param to the json responsebvl-group-shared-projects-private-api	Toon Claes	2018-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix small typos	Toon Claes	2018-05-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add `shared_projects` endpoint	Bob Van Landuyt	2018-05-29	1	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This endpoint lists projects shared with a group visible to the current user. The `filter` and `sort` params are supported like on the `children` endpoint.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rails5-boolean-cast' into 'master'46973-job-failed-71275338	Rémy Coutable	2018-05-30	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix boolean casting for nil value Closes #46925 See merge request gitlab-org/gitlab-ce!19202
\| * \| \| \| \| \| \| \| \| \|	Fix boolean casting for nil value	Jan Provaznik	2018-05-29	1	-2/+3
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`nil` value is not included in `ActiveModel::Type::Boolean::FALSE_VALUES` which caused that in Rails 5 the boolean_accessor converted `nil` to `true` instead of `false`.
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-submit-not-clearing-local-storage' into 'master'	Filipa Lacerda	2018-05-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix local storage not being cleared after creating a new issue Closes #37162 See merge request gitlab-org/gitlab-ce!19226
\| * \| \| \| \| \| \| \| \| \|	Fix local storage not being cleared after creating a new issue	Stan Hu	2018-05-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creating a new issue will always result in a 302 redirect to the newly-created issue. This reverts the change introduced in https://gitlab.com/gitlab-org/gitlab-ce/commit/7684217d6806408cd338260119364419260d1720 to handle the case where a user is in the middle of creating a new form and redirected to accepting the terms of service. Closes #37162
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'mattermost-api-v4' into 'master'	Sean McGivern	2018-05-30	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Mattermost integration to use Mattermost API v4 Closes #41631 See merge request gitlab-org/gitlab-ce!19043
\| * \| \| \| \| \| \| \| \| \| \|	Updated help text for team list for Mattermost slash commands	Harrison Healey	2018-05-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'render_super' into 'master'	Rémy Coutable	2018-05-30	2	-4/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Add render_ce to render CE partial in EE partial See merge request gitlab-org/gitlab-ce!19150
\| * \| \| \| \| \| \| \| \| \| \| \|	Unify app/views/shared/issuable/form/_title.html.haml	Lin Jen-Shin	2018-05-28	2	-4/+5
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'	Phil Hughes	2018-05-30	13	-30/+152
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Squash and merge in GitLab Core (CE)" Closes #34591 See merge request gitlab-org/gitlab-ce!18956