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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'spec-minor-fix' into 'master'	Rémy Coutable	2017-05-15	1	-8/+1
\|\ \| \| \| \| \| \| \| \|	Minor spec improvement See merge request !11373
\| *	Minor spec improvementspec-minor-fix	Valery Sizov	2017-05-15	1	-8/+1
\| \|
* \|	Create a Users Finder	George Andrinopoulos	2017-05-15	1	-0/+66
\| \|
* \|	Add script to regenerate seed_repo.rb for Gitlab::Git tests	Jacob Vosmaer (GitLab)	2017-05-15	2	-1/+172
\| \|
* \|	Merge branch 'enable-auto-cancelling-by-default' into 'master'	Kamil Trzciński	2017-05-15	1	-2/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make auto-cancelling pending pipelines on by default Closes #30656 See merge request !11023
\| * \|	Disable auto_cancel_pending_pipelines in PostReceive test	Lin Jen-Shin	2017-05-15	1	-2/+5
\| \| \|
* \| \|	Merge branch 'allow_numeric_values_in_gitlab_ci_yml' into 'master'	Kamil Trzciński	2017-05-15	2	-2/+10
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow numeric values in gitlab-ci.yml Closes #30017 See merge request !10607
\| * \|	Allow numeric values in gitlab-ci.yml	blackst0ne	2017-05-07	2	-2/+10
\| \| \|
* \| \|	Merge branch 'rename-column-concurrently-defaults' into 'master'	Rémy Coutable	2017-05-15	1	-2/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix adding defaults for concurrent column renames See merge request !11335
\| * \| \|	Fix adding defaults for concurrent column renamesrename-column-concurrently-defaults	Yorick Peterse	2017-05-12	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By adding the default value _after_ adding the column we avoid updating all rows in a table, saving a lot of time and unnecessary work in the process.
* \| \| \|	Added balsamiq jasmine integration test	Luke "Jared" Bennett	2017-05-15	4	-27/+81
\| \| \| \|
* \| \| \|	Merge branch 'dturner/username' into 'master'	Rémy Coutable	2017-05-15	1	-0/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: David Turner <novalis@novalis.org>
* \| \| \|	Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master'	Robert Speicher	2017-05-14	2	-24/+41
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch commit deltas from Gitaly Closes gitaly#199 See merge request !11122
\| * \| \| \|	Add support for deltas_only under Gitaly	Ahmad Sherif	2017-05-13	2	-24/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#199
* \| \| \| \|	Merge branch '26325-system-hooks' into 'master'	Robert Speicher	2017-05-13	6	-3/+76
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport New SystemHook: `repository_update` Closes #26325 See merge request !11140
\| * \| \| \| \|	Codestyle	Gabriel Mazetto	2017-05-13	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Update SystemHooks API to expose and handle new repository_update_events	Gabriel Mazetto	2017-05-12	2	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Make the new repository_update_events configurable in System Hooks UI	Gabriel Mazetto	2017-05-12	2	-0/+41
\| \| \| \| \| \|
\| * \| \| \| \|	Added repository_update hook	Gabriel Mazetto	2017-05-12	3	-1/+31
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-wait-for-requests' into 'master'	Douwe Maan	2017-05-12	1	-6/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wait for requests after each Spinach scenario instead of feature See merge request !11349
\| * \| \| \| \|	Wait for requests after each Spinach scenario instead of featuredm-wait-for-requests	Douwe Maan	2017-05-12	1	-6/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '30975-fixed-top-nav-POC' into 'master'	Annabel Dunstone Gray	2017-05-12	8	-17/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add fixed positioning to top level navbar Closes #30975 See merge request !10751
\| * \| \| \| \| \|	Fix specs	Annabel Dunstone Gray	2017-05-12	2	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix specs	Annabel Dunstone Gray	2017-05-12	7	-14/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-relax-backup-rake-spec' into 'master'	Stan Hu	2017-05-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relax rake backup regex to handle CE and EE RCs See merge request !11345
\| * \| \| \| \| \| \|	Relax rake backup regex to handle CE and EE RCssh-relax-backup-rake-spec	Stan Hu	2017-05-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See http://rubular.com/r/uTDlT85zW1
* \| \| \| \| \| \| \|	Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'	Douwe Maan	2017-05-12	6	-91/+114
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-91/+114
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+63
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Usage ping updates Closes #31741 and #31453 See merge request !11231
\| * \| \| \| \| \| \| \|	Add hostname to usage ping	Sean McGivern	2017-05-11	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow disabling usage ping in `gitlab.yml`	Sean McGivern	2017-05-11	1	-0/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-14/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Add parent full path to project list cache key	Dmitriy Zaporozhets	2017-05-12	2	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'dm-dependency-linker-gemfile' into 'master'	Sean McGivern	2017-05-12	9	-13/+165
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Autolink package names in Gemfile See merge request !11224
\| * \| \| \| \| \| \| \| \|	Remove unrelated link from spec	Douwe Maan	2017-05-12	1	-7/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Link Gemfile git URLs	Douwe Maan	2017-05-12	1	-1/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix specs	Douwe Maan	2017-05-10	2	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Autolink package names in Gemfile	Douwe Maan	2017-05-10	3	-0/+87
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add Gitlab::StringRegexMarker	Douwe Maan	2017-05-10	2	-2/+20
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Extract generic parts of Gitlab::Diff::InlineDiffMarker	Douwe Maan	2017-05-10	3	-9/+59
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Removed all instances of Object.assign by using es6 classes, also includes ↵	Luke "Jared" Bennett	2017-05-12	2	-51/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some …
* \| \| \| \| \| \| \| \| \|	Merge branch '27439-performance-deltas' into 'master'	Douwe Maan	2017-05-12	7	-44/+116
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
\| * \| \| \| \| \| \| \| \| \|	Respond with 404 when metrics are not enabled or deployment_metrics is not ↵	Pawel Chojnacki	2017-05-12	1	-21/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	implemented
\| * \| \| \| \| \| \| \| \| \|	Avoid comma t the end of hash	Pawel Chojnacki	2017-05-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	match query times with appropriate delta	Pawel Chojnacki	2017-05-11	1	-8/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Keep presentation logic in one place and remove unecessary arguments.	Pawel Chojnacki	2017-05-11	4	-13/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ fix tests
\| * \| \| \| \| \| \| \| \| \|	Custom queries for prometheus	Pawel Chojnacki	2017-05-11	4	-16/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Tests for prometheus queries - fix rubocop warnings - Remove unused method. Add more queries to deployment queries. - Wrap BaseQuery in module hierarchy Renname Prometheus class to PrometheusClient
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-fix-dynamic-path-query' into 'master'	Douwe Maan	2017-05-12	1	-0/+31
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only rename namespaces and projects with an invalid path See merge request !11338