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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Removed the target=_blank from the monitoring componentenvironments-button-open-same-tab	Jose Ivan Vargas	2017-05-15	1	-0/+5
\|
*	Merge branch 'fix-github-import' into 'master'	Douwe Maan	2017-05-15	1	-0/+4
\|\ \| \| \| \| \| \| \| \|	Fix token interpolation when setting the Github remote See merge request !11311
\| *	Add CHANGELOGfix-github-import	Douglas Barbosa Alexandre	2017-05-11	1	-0/+4
\| \|
* \|	Merge branch '31886-remover-comment-load-spinner' into 'master'	Annabel Dunstone Gray	2017-05-15	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	31886 Remove spinner from loading comment Closes #31886 See merge request !11339
\| * \|	31886 Remove spinner from loading comment31886-remover-comment-load-spinner	tauriedavis	2017-05-12	1	-0/+4
\| \| \|
* \| \|	Merge branch 'adam-influxdb-hostname' into 'master'	Douwe Maan	2017-05-15	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow GitLab instance to start when InfluxDB hostname cannot be resolved Closes #24438 See merge request !11356
\| * \| \|	Allow GitLab instance to start when InfluxDB hostname cannot be resolvedadam-influxdb-hostname	Adam Niedzielski	2017-05-13	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #24438
* \| \| \|	Merge branch 'enable-auto-cancelling-by-default' into 'master'	Kamil Trzciński	2017-05-15	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make auto-cancelling pending pipelines on by default Closes #30656 See merge request !11023
\| * \| \| \|	Make auto-cancelling pending pipelines on by default	Lin Jen-Shin	2017-05-15	1	-0/+4
\| \|/ / /
* \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-05-15	50	-25/+180
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add-index-for-auto_canceled_by_id-mysql * upstream/master: (224 commits) Added balsamiq jasmine integration test Add support for deltas_only under Gitaly Codestyle Update CHANGELOG.md for 9.1.4 Update CHANGELOG.md for 9.1.4 Update CHANGELOG.md for 9.1.4 Update CHANGELOG.md for 9.1.4 Minor cosmetic fixes in hooks admin screen Documentation for repository_update_events Changelog Update SystemHooks API to expose and handle new repository_update_events Make the new repository_update_events configurable in System Hooks UI Added repository_update hook Wait for requests after each Spinach scenario instead of feature Remove trailing comma in dependency linker to satisfy Rubocop Fix specs New branch new mr docs Relax rake backup regex to handle CE and EE RCs Fix conflict resolution from corrupted upstream Removed all instances of Object.assign by using es6 classes, also includes some … ...
\| * \ \ \	Merge branch 'allow_numeric_values_in_gitlab_ci_yml' into 'master'	Kamil Trzciński	2017-05-15	1	-0/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow numeric values in gitlab-ci.yml Closes #30017 See merge request !10607
\| \| * \| \| \|	Allow numeric values in gitlab-ci.yml	blackst0ne	2017-05-07	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'dturner/username' into 'master'	Rémy Coutable	2017-05-15	1	-0/+4
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add username field to push webhook Closes #32136 See merge request !11272
\| \| * \| \| \|	Add username field to push webhook	David Turner	2017-05-10	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: David Turner <novalis@novalis.org>
\| * \| \| \| \|	Merge branch '26325-system-hooks' into 'master'	Robert Speicher	2017-05-13	1	-0/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport New SystemHook: `repository_update` Closes #26325 See merge request !11140
\| \| * \| \| \| \|	Changelog	Gabriel Mazetto	2017-05-12	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update CHANGELOG.md for 9.1.4	Felipe Artur	2017-05-12	8	-33/+0
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'	Douwe Maan	2017-05-12	1	-0/+5
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
\| \| * \| \| \| \|	Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos	Sean McGivern	2017-05-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.
\| * \| \| \| \| \|	Merge branch 'disable-usage-ping' into 'master'	Robert Speicher	2017-05-12	2	-0/+8
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Usage ping updates Closes #31741 and #31453 See merge request !11231
\| \| * \| \| \| \| \|	Add hostname to usage ping	Sean McGivern	2017-05-11	1	-0/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Allow disabling usage ping in `gitlab.yml`	Sean McGivern	2017-05-11	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Setting `usage_ping_enabled` to false in `gitlab.yml`: 1. Disables the usage ping, regardless of the value stored in the database. 2. Prevents the usage ping from being enabled through the admin panel. It can only be enabled by either removing the line from `gitlab.yml` and configuring through the admin panel, or setting it to true in `gitlab.yml`.
\| * \| \| \| \| \| \|	Merge branch 'dz-project-list-cache-key' into 'master'	Douwe Maan	2017-05-12	1	-0/+4
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve project list cache key Closes #31863 See merge request !11325
\| \| * \| \| \| \| \| \|	Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-key	Dmitriy Zaporozhets	2017-05-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Add parent full path to project list cache key	Dmitriy Zaporozhets	2017-05-12	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Merge branch 'dm-dependency-linker-gemfile' into 'master'	Sean McGivern	2017-05-12	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Autolink package names in Gemfile See merge request !11224
\| \| * \| \| \| \| \| \| \|	Add changelogdm-dependency-linker-gemfile	Douwe Maan	2017-05-12	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into 'dm-copy-mr-source-branch-as-gfm'dm-copy-mr-source-branch-as-gfm	Douwe Maan	2017-05-12	7	-0/+28
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
\| \| * \| \| \| \| \| \| \|	Consistently use monospace font for commit SHAs and branch and tag names	Douwe Maan	2017-05-12	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2017-05-12	1	-0/+4
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'31384-new-issue-button-on-no-results-page-after-search-doesn-t-go-to-correct-form' into 'master' Remove 'New Issue' button from 'There are no issues to show' state graphic Closes #31384 See merge request !11263
\| \| \| * \| \| \| \| \| \| \|	Remove 'New issue' button when issues search returns no results.	Bryce Johnson	2017-05-11	1	-0/+4
\| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'protected-branches-no-one-merge' into 'master'	Sean McGivern	2017-05-12	1	-0/+4
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enabled 'no one' as a merge access level in protected branches Closes #31541 See merge request !11232
\| \| \| * \| \| \| \| \| \| \|	Enabled no-one as a merge access level in protected branches	Phil Hughes	2017-05-10	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31541
\| \| * \| \| \| \| \| \| \| \|	Merge branch '32178-prevent-merge-on-sha-change' into 'master'	Fatih Acet	2017-05-12	1	-0/+4
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "SHA mismatch" state to the MR widget Closes #32178 See merge request !11316
\| \| \| * \| \| \| \| \| \| \| \|	add CHANGELOG.md entry for !1131632178-prevent-merge-on-sha-change	Mike Greiling	2017-05-11	1	-0/+4
\| \| \| \| \|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Uniform CI status components in vue	Filipa Lacerda	2017-05-12	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch '31978-cross-reference-fix' into 'master'	Sean McGivern	2017-05-12	1	-0/+4
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cross referencing for private and internal projects Closes #31978 See merge request !11243
\| \| \| * \| \| \| \| \| \| \|	Fix cross referencing for private and internal projects31978-cross-reference-fix	Jarka Kadlecova	2017-05-11	1	-0/+4
\| \| \| \| \|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'pipeline-schedules-callout-docs-url' into 'master'	Filipa Lacerda	2017-05-11	1	-0/+4
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set correct docsUrl in pipeline schedules callout component. Closes #31957 See merge request !11216
\| \| \| * \| \| \| \| \| \|	Pass docsUrl to pipeline schedules callout component.pipeline-schedules-callout-docs-url	Bryce Johnson	2017-05-11	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Paste a copied MR source branch name as code when pasted into a GFM form	Douwe Maan	2017-05-11	1	-0/+4
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'winh-pipeline-author-link' into 'master'	Filipa Lacerda	2017-05-11	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to commit author user page from pipelines Closes #29368 See merge request !11100
\| \| * \| \| \| \| \| \| \|	Link to commit author user page from pipelines (!11100)	winh	2017-05-11	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'zj-clean-up-ci-variables-table' into 'master'	Yorick Peterse	2017-05-11	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up ci variables table Closes #31799 See merge request !11186
\| \| * \| \| \| \| \| \| \| \|	Remove rails dependent: :destroy statement	Z.J. van de Weg	2017-05-11	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enforced by the database, and no callbacks need to be called. Combined with 7b9b2c6099 and 294a8b8a6d this resolves gitlab-org/gitlab-ce#31799
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'issue-templates-summary-lines' into 'master'	Rémy Coutable	2017-05-11	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add summary lines for collapsed details in the bug report template See merge request !11280
\| \| * \| \| \| \| \| \| \| \|	Add summary lines for collapsed details in the bug report template	Mark Fletcher	2017-05-11	1	-0/+4
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
\| * \| \| \| \| \| \| \| \|	Merge branch '31781-print-rendered-files-not-possible' into 'master'	Annabel Dunstone Gray	2017-05-11	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include blob content when printing page Closes #31781 See merge request !11247
\| \| * \| \| \| \| \| \| \|	Include blob content when printing page31781-print-rendered-files-not-possible	Sam Rose	2017-05-10	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'issue_api_change' into 'master'	Sean McGivern	2017-05-11	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue API change: assignee_id parameter and assignee object in a response See merge request !11271