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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Only renders empty state for pipelines table if no pipelines are received ↵	Filipa Lacerda	2017-05-16	1	-0/+4
\| \| \| \|	when request is made
*	Merge branch 'environments-button-open-same-tab' into 'master'	Annabel Dunstone Gray	2017-05-16	1	-0/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Removed the target=_blank from the monitoring component Closes #32243 See merge request !11386
\| *	Removed the target=_blank from the monitoring componentenvironments-button-open-same-tab	Jose Ivan Vargas	2017-05-15	1	-0/+5
\| \|
* \|	#32340 - Include mention of "manual" scope in jobs api doc	Zac Sturgess	2017-05-16	1	-0/+4
\| \|
* \|	Merge branch 'cherry-pick-0663458c' into 'master'	Douwe Maan	2017-05-16	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename `build_events` to `job_events`, take 2. Closes #31620 See merge request !11403
\| * \|	Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458c	Douwe Maan	2017-05-16	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename `build_events` to `job_events` Closes #31620 See merge request !11287
* \| \|	Rename Personal Audit Log	Tim Zallmann	2017-05-16	1	-0/+4
\|/ /
* \|	Merge branch 'zj-pipeline-schedule-owner' into 'master'	Kamil Trzciński	2017-05-16	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Foreign key for Pipeline schedule owner Closes #31932 See merge request !11233
\| * \|	Do not schedule pipelines if the user can't	Z.J. van de Weg	2017-05-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the owner of a pipelines schedule was either blocked or was removed from the project, the pipeline schedular would still schedule the pipeline. This would than fail however, given the user had no access to the project and it contents. However, a better way to handle it would be to not schedule it at all. Furthermore, from now on, such schedules will be deactivated so the schedule worker can ignore it on the next runs.
* \| \|	Merge branch ↵	Kamil Trzciński	2017-05-16	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32219-speed-up-yarn-install-in-ci-by-utilizing-inter-pipeline-cache' into 'master' Resolve "Speed up `yarn install` in CI by utilizing inter-pipeline cache" Closes #32219 See merge request !11343
\| * \| \|	add CHANGELOG.md entry for !11343	Mike Greiling	2017-05-16	1	-0/+4
\| \| \| \|
* \| \| \|	Merge branch '24373-warning-message-go-away' into 'master'	Phil Hughes	2017-05-16	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notes warning message should go away once resolved Closes #24373 See merge request !10823
\| * \| \| \|	Notes: Warning message should go away once resolved	Jacopo	2017-05-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Flash error messages disappear(`fadeOut`) automatically after any successful request
* \| \| \| \|	Merge branch 'omega-submodules' into 'master'	Robert Speicher	2017-05-15	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Omega submodules See merge request !10797
\| * \| \| \| \|	submodule_links: Handle in-repository submodule urls	David Turner	2017-05-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sometimes it is useful to store submodules in the same repository which contains links to them. Make the UI support this. See https://github.com/twosigma/git-meta/wiki/The-Omega-Repo for information about this strategy Signed-off-by: David Turner <novalis@novalis.org>
* \| \| \| \| \|	Merge branch '31902-namespace-recent-searches-to-project' into 'master'	Annabel Dunstone Gray	2017-05-15	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Scope recent searches to project Closes #31902 See merge request !11142
\| * \| \| \| \| \|	Scope recent searches to project	Eric Eastwood	2017-05-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31902
* \| \| \| \| \| \|	Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"	Douwe Maan	2017-05-15	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !11287
* \| \| \| \| \| \|	Merge branch '31106-tabs-alignment' into 'master'	Annabel Dunstone Gray	2017-05-15	1	-0/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix Resolved Discussions counter wrapping to next line Closes #31106 See merge request !10775
\| * \| \| \| \| \|	fix Resolved Discussions counter wrapping to next line	Simon Knox	2017-05-13	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change all .nav-links to use flex place Resolve Discussions above tabs on small screens, and to the right on large
* \| \| \| \| \| \|	Merge branch 'bvl-rename-build-events-to-job-events' into 'master'	Douwe Maan	2017-05-15	1	-0/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename `build_events` to `job_events` Closes #31620 See merge request !11287
\| * \| \| \| \| \|	Add `build_events` to project service in the API	Bob Van Landuyt	2017-05-15	1	-0/+4
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For backwards compatibility
* \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \|