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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add higher z-index to fixed nav32303-nav-z-index	Annabel Dunstone Gray	2017-05-15	1	-0/+1
\|
*	Merge branch '31106-tabs-alignment' into 'master'	Annabel Dunstone Gray	2017-05-15	5	-54/+77
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-54/+77
\| \| \| \| \| \| \| \| \| \|	change all .nav-links to use flex place Resolve Discussions above tabs on small screens, and to the right on large
* \|	Merge branch 'rename-rendered_title' into 'master'	Rémy Coutable	2017-05-15	3	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Rename all references to rendered_title to realtime_changes See merge request !11359
\| * \|	Rename all references to rendered_title to realtime_changesrename-rendered_title	Luke "Jared" Bennett	2017-05-13	3	-5/+5
\| \| \|
* \| \|	Merge branch 'bvl-rename-build-events-to-job-events' into 'master'	Douwe Maan	2017-05-15	7	-11/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename `build_events` to `job_events` Closes #31620 See merge request !11287
\| * \| \|	Rename `build_events` to `job_events` in code	Bob Van Landuyt	2017-05-15	7	-11/+11
\| \| \| \|
* \| \| \|	Improve slash command stripping, escape temporary note contents	Kushal Pandya	2017-05-15	1	-2/+3
\| \| \| \|
* \| \| \|	Merge branch '32184-retried-jobs' into 'master'	Phil Hughes	2017-05-15	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use fa-refresh on retried jobs Closes #32184 See merge request !11337
\| * \| \| \|	Use fa-refresh on retried jobs32184-retried-jobs	Annabel Dunstone Gray	2017-05-12	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'gitaly-reuse-stubs' into 'master'	Robert Speicher	2017-05-15	1	-2/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reuse gRPC stubs instead of channels Closes #31991 and gitaly#187 See merge request !11244
\| * \| \| \| \|	Don't reuse gRPC channels	Jacob Vosmaer	2017-05-15	1	-2/+0
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It seems that bad things happen when two gRPC stubs share one gRPC channel so let's stop doing that. The downside of this is that we create more gRPC connections; one per stub.
* \| \| \| \|	Merge branch '31886-remover-comment-load-spinner' into 'master'	Annabel Dunstone Gray	2017-05-15	1	-3/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-3/+0
\| \| \| \| \| \|
* \| \| \| \| \|	MR zindex regression	Luke "Jared" Bennett	2017-05-15	3	-2/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Create a Users Finder	George Andrinopoulos	2017-05-15	1	-0/+74
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dz-fix-file-mode' into 'master'	Douwe Maan	2017-05-15	1	-0/+0
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ruby files that are not meant to be executable should be 644 not 755 See merge request !11369
\| * \| \| \| \|	Ruby files that are not meant to be executable should be 644 not 755dz-fix-file-mode	Dmitriy Zaporozhets	2017-05-15	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Added balsamiq jasmine integration test	Luke "Jared" Bennett	2017-05-15	2	-20/+36
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master'	Robert Speicher	2017-05-14	1	-2/+10
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch commit deltas from Gitaly Closes gitaly#199 See merge request !11122
\| * \| \| \| \|	Add support for deltas_only under Gitaly	Ahmad Sherif	2017-05-13	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#199
* \| \| \| \| \|	Merge branch 'use-common-vue-for-pipeline-schedule-bundles' into 'master'	Filipa Lacerda	2017-05-14	2	-3/+4
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure schedule_form and schedules_index both utilize common_vue bundle See merge request !11274
\| * \| \| \| \|	ensure schedule_form and schedules_index both utilize common_vue bundleuse-common-vue-for-pipeline-schedule-bundles	Mike Greiling	2017-05-12	2	-3/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Minor cosmetic fixes in hooks admin screen	Gabriel Mazetto	2017-05-12	2	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Make the new repository_update_events configurable in System Hooks UI	Gabriel Mazetto	2017-05-12	4	-2/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Added repository_update hook	Gabriel Mazetto	2017-05-12	3	-3/+25
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '30975-fixed-top-nav-POC' into 'master'	Annabel Dunstone Gray	2017-05-12	12	-9/+40
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add fixed positioning to top level navbar Closes #30975 See merge request !10751
\| * \| \| \| \| \|	Clean up fixed navbar	Annabel Dunstone Gray	2017-05-12	3	-6/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix specs	Annabel Dunstone Gray	2017-05-12	2	-3/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fade out border on scroll	Annabel Dunstone Gray	2017-05-12	4	-11/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add animation to navbar border	Annabel Dunstone Gray	2017-05-12	1	-2/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add nav border on scroll	Annabel Dunstone Gray	2017-05-12	2	-0/+15
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove trailing semicolon	Annabel Dunstone Gray	2017-05-12	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add fixed positioning to top level navbar	Annabel Dunstone Gray	2017-05-12	9	-8/+16
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'	Douwe Maan	2017-05-12	7	-101/+115
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	7	-101/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-8/+23
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Usage ping updates Closes #31741 and #31453 See merge request !11231
\| * \| \| \| \| \| \|	Allow disabling usage ping in `gitlab.yml`	Sean McGivern	2017-05-11	2	-8/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-2/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-7/+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	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'dm-dependency-linker-gemfile' into 'master'	Sean McGivern	2017-05-12	6	-2/+27
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Autolink package names in Gemfile See merge request !11224
\| * \| \| \| \| \| \| \| \|	Turn blob dependency links blue	Douwe Maan	2017-05-10	5	-0/+25
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Extract generic parts of Gitlab::Diff::InlineDiffMarker	Douwe Maan	2017-05-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-copy-mr-source-branch-as-gfm' into 'master'	Sean McGivern	2017-05-12	1	-1/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Paste a copied MR source branch name as code when pasted into a GFM form See merge request !11315
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into 'dm-copy-mr-source-branch-as-gfm'dm-copy-mr-source-branch-as-gfm	Douwe Maan	2017-05-12	140	-1547/+1525
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
\| * \| \| \| \| \| \| \| \| \|	Satisfy ESlint	Douwe Maan	2017-05-12	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Paste a copied MR source branch name as code when pasted into a GFM form	Douwe Maan	2017-05-11	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Removed all instances of Object.assign by using es6 classes, also includes ↵	Luke "Jared" Bennett	2017-05-12	5	-212/+198
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some …
* \| \| \| \| \| \| \| \| \| \|	Merge branch '27439-performance-deltas' into 'master'	Douwe Maan	2017-05-12	5	-37/+23
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981