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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'sh-optimize-groups-api-10-2' into '10-2-stable-patch-5'10-2-stable-patch-5	Winnie Hellmann	2017-12-14	18	-60/+292
\|\ \| \| \| \| \| \| \| \|	Optimize API /groups/:id/projects by preloading assocations (10.2 port) See merge request gitlab-org/gitlab-ce!15926
\| *	Solved copy/paste error!	Francisco Javier López	2017-12-14	1	-4/+5
\| \|
\| *	Resolving conflictsh-optimize-groups-api-10-2	Francisco Javier López	2017-12-14	1	-23/+5
\| \|
\| *	Resolving conflict	Francisco Javier López	2017-12-14	1	-5/+6
\| \|
\| *	Resolving conflict	Francisco Javier López	2017-12-14	1	-4/+1
\| \|
\| *	Merge branch 'sh-optimize-groups-api' into 'master'	Douwe Maan	2017-12-14	18	-32/+271
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize API /groups/:id/projects by preloading assocations Closes #40308 See merge request gitlab-org/gitlab-ce!15475 (cherry picked from commit 65b7a7a0632280c77de1dc9d6c93dfb5df0c2fc9) Conflicts: lib/api/groups.rb
\| *	Cherry pick lib/api/entities.rb from 763ea26dc6be7760e4084b57bcf56f32e3e9ef0a	Kamil Trzciński	2017-12-14	1	-7/+19
\| \|
* \|	Merge branch 'bvl-fork-networks-for-deleted-projects-10-2' into ↵	Winnie Hellmann	2017-12-14	5	-7/+111
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'10-2-stable-patch-5' Create fork networks for deleted source projects (10.2 port) See merge request gitlab-org/gitlab-ce!15927
\| * \|	Resolve conflicts in `populate_fork_networks_range.rb`	Bob Van Landuyt	2017-12-14	1	-3/+0
\| \| \|
\| * \|	Merge branch 'bvl-fork-networks-for-deleted-projects' into 'master'	Sean McGivern	2017-12-14	5	-7/+114
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create fork networks for deleted source projects Closes #40072 See merge request gitlab-org/gitlab-ce!15595 (cherry picked from commit 552c90893059dc5a9a525d7ed79359542f70aad6) Conflicts: lib/gitlab/background_migration/populate_fork_networks_range.rb
* \| \|	Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version-10-2' ↵	Winnie Hellmann	2017-12-14	3	-13/+5
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	into '10-2-stable-patch-5' Update prometheus-client-mmap gem to highly optimized version (10.2 port) See merge request gitlab-org/gitlab-ce!15928
\| * \|	Resolve conflict in config/initializers/7_prometheus_metrics.rb	Winnie Hellmann	2017-12-14	1	-12/+0
\| \| \|
\| * \|	Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into ↵	Stan Hu	2017-12-14	3	-4/+8
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update prometheus-client-mmap gem to highly optimized version See merge request gitlab-org/gitlab-ce!15796 (cherry picked from commit aa24f7e1abac167189a76590dbaccd5b53726507) Conflicts: config/initializers/7_prometheus_metrics.rb
* \|	Merge branch 'winh-upgrade-codeclimate' into 'master'	Rémy Coutable	2017-12-14	1	-1/+1
\|/ \| \| \| \| \| \| \| \| \| \| \|	Upgrade codeclimate image to latest Closes #40255 See merge request gitlab-org/gitlab-ce!15461 (cherry picked from commit c26d7089d058dc22116f383815da8cec80a99ac5) 586d878d Upgrade codeclimate image to 0.70.1 18231881 Use latest codeclimate image again
*	Merge branch 'sh-bump-prometheus-gem-properly' into 'master'	Robert Speicher	2017-12-14	2	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Properly bump prometheus-client-mmap gem versions See merge request gitlab-org/gitlab-ce!15825 (cherry picked from commit a2d1648076cf55b09562f7ef081fd9e479398ab6) Conflicts: Gemfile Gemfile.lock
*	Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' ↵	Tim Zallmann	2017-12-14	2	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Prometheus loading screen no longer seems to appear" Closes #40285 See merge request gitlab-org/gitlab-ce!15889 (cherry picked from commit a8b9852837c3ecde3148a7e989d53fd5ac025bc3) d072c0cd fix broken empty state assets for environment monitoring page 9864720a add CHANGELOG.md entry for !15889
*	Merge branch 'sh-fix-import-rake-task' into 'master'	James Lopez	2017-12-14	5	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitlab:import:repos Rake task moving repositories into the wrong location Closes #40765 See merge request gitlab-org/gitlab-ce!15823 (cherry picked from commit 7694ae887885c66eb633d3f78eac3128a08dc978) 78f7c3c8 Fix gitlab:import:repos Rake task moving repositories into the wrong location e8cced80 Fix failing importer test case on MySQL due to missing trailing slash in root path 917a112e Simplify normalizing of paths 86661a3a Use build instead of create in importer spec f1eaab7b Remove the need for destroy and add a comment in the spec
*	Merge branch 'sh-bump-redis-actionpack' into 'master'	Robert Speicher	2017-12-14	2	-15/+15
\| \| \| \| \| \| \| \| \| \| \|	Bump redis-rails to 5.0.2 to get redis-store security updates Closes #40889 See merge request gitlab-org/gitlab-ce!15773 (cherry picked from commit 6808d11b058939e61deea8c164f5b01aa19c9176) f76aaa21 Bump redis-rails to 5.0.2 to get redis-store security updates
*	Merge branch 'backport-board-scope-highlight' into 'master'	Sean McGivern	2017-12-14	1	-0/+10
\| \| \| \| \| \| \| \| \|	Backport board scope highlight See merge request gitlab-org/gitlab-ce!15757 (cherry picked from commit 0803a0b3cc6188adc51b034278085f3dba5b53b2) 6f256386 backport board scope highlight
*	Merge branch ↵	Jacob Schatz	2017-12-14	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|	'40555-replace-absolute-urls-with-related-branches-to-avoid-hostname' into 'master' Replace absolute URLs on related branches/MRs with relative url to avoid hostname Closes #40555 See merge request gitlab-org/gitlab-ce!15735 (cherry picked from commit 73a79f7efbd8dec42b4a344faa3df5bf1c57a315) 88f268b5 Replace absolute URLs on related branches/MRs with relative url to avoid hostname
*	Merge branch '40715-updateendpoint-undefined-on-issue-page' into 'master'	Clement Ho	2017-12-14	2	-25/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "updateEndpoint undefined on Issue page" Closes #40715 See merge request gitlab-org/gitlab-ce!15698 (cherry picked from commit be8ca260dadae948d09a87664baed8c85d133434) 3e9e773c Remove unused updateUrl and updateEndpoint 0ce9215e Revert updateUrl and updateEndpoint removal and instead pass updateEndpoint… 15b2fc3b simplify props for issue_show app root 4d86f05a Add changelog entry
*	Merge branch '40592-dropdown-options-are-misaligned' into 'master'	Clement Ho	2017-12-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|	Resolve "Dropdown options are misaligned" Closes #40592 See merge request gitlab-org/gitlab-ce!15693 (cherry picked from commit 2b07c2eeabe5e107d2e6ad973e218736dfc4bcd7) 6a1052c1 remove top from dropdown-label-box that is child of filter-dropdown-item
*	Merge branch '40711-fix-forking-hashed-projects' into 'master'	Douwe Maan	2017-12-14	8	-72/+61
\| \| \| \| \| \| \| \| \| \| \|	Fix the fork project functionality for projects with hashed storage Closes #40711 See merge request gitlab-org/gitlab-ce!15671 (cherry picked from commit 50eb125282ba83e71447161ee2add396fa5eef9b) 327a9898 Fix the fork project functionality for projects with hashed storage
*	Merge branch 'bvl-double-fork' into 'master'	Phil Hughes	2017-12-14	4	-17/+48
\| \| \| \| \| \| \| \| \|	Redirect to an already forked project if it exists See merge request gitlab-org/gitlab-ce!15653 (cherry picked from commit fbe8dfb3008a0502fbc6234a169851a70707b7b6) 299c5439 Redirect to an already forked project if it exists
*	Merge branch '40543-generalize-detail-page-headers' into 'master'	Phil Hughes	2017-12-14	9	-79/+66
\| \| \| \| \| \| \| \| \| \| \|	Generalize detail page headers (Issues, Merge Requests, Snippets) Closes #40543 See merge request gitlab-org/gitlab-ce!15639 (cherry picked from commit 5d9585d1bde360c9bba2dc960523cbe1e648994f) 6d61b404 Generalize detail page headers
*	Merge branch 'protected-branches-names' into 'master'	Douwe Maan	2017-12-14	3	-2/+11
\| \| \| \| \| \| \| \| \|	Only load branch names for protected branch checks See merge request gitlab-org/gitlab-ce!15629 (cherry picked from commit 1aaa6095a2d8890df73731a8af3d26158a198743) a0527ab8 Only load branch names for protected branch checks
*	Merge branch 'bvl-circuitbreaker-keys-set' into 'master'	Douwe Maan	2017-12-14	6	-23/+42
\| \| \| \| \| \| \| \| \|	Keep track of all storage keys in a set See merge request gitlab-org/gitlab-ce!15613 (cherry picked from commit 02111f4d4d03246530e8453d669c63cdbe80fb44) b72d2438 Keep track of all storage keys in a set
*	Merge branch '40615-specific-10-2-fix' into '10-2-stable'	Winnie Hellmann	2017-12-11	3	-0/+17
\|\ \| \| \| \| \| \| \| \|	Backport !15678 to `10-2-stable` See merge request gitlab-org/gitlab-ce!15680
\| *	Merge branch 'sh-fix-root-ref-repository' into 'master'40615-specific-10-2-fix	Rémy Coutable	2017-12-01	3	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gracefully handle case when repository's root ref does not exist Closes #40615 See merge request gitlab-org/gitlab-ce!15678 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Update VERSION to 10.2.4v10.2.4	Winnie Hellmann	2017-12-07	1	-1/+1
\| \|
* \|	Update CHANGELOG.md for 10.2.4	Winnie Hellmann	2017-12-07	4	-15/+9
\| \| \| \| \| \|	[ci skip]
* \|	Merge branch '10-2-stable-patch-4' into '10-2-stable'	Winnie Hellmann	2017-12-06	16	-47/+231
\|\ \ \| \|/ \|/\| \| \| \| \|	Prepare 10.2.4 security release See merge request gitlab/gitlabhq!2241
\| *	Merge branch 'note-preview' into 'security-10-2'	Fatih Acet	2017-12-06	2	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prevent potential XSS when editing comment See merge request gitlab/gitlabhq!2238 (cherry picked from commit 80ed6d25a46c0f70ec8baea78b5777118d63876c) 7480e462 prevent potential XSS when editing comment
\| *	Merge branch 'issue_30663' into 'security-10-2'	Sean McGivern	2017-12-06	3	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent creating issues through API without having permissions See merge request gitlab/gitlabhq!2225 (cherry picked from commit c298bbaa88883343dc9cbbb6abec0808fb3b546c) 915b97c5 Prevent creating issues through API without having permissions
\| *	Merge branch 'rs-security-group-api' into 'security-10-2'	Douwe Maan	2017-12-06	3	-2/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.2] Ensure we expose group projects using GroupProjectsFinder See merge request gitlab/gitlabhq!2234 (cherry picked from commit 072f8f2fd6ec794645375a16ca4ddc1cbeb76d7a) a2240338 Ensure we expose group projects using GroupProjectsFinder
\| *	Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'	Douwe Maan	2017-12-06	4	-33/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(10.2) Avoid partial partial email adresses for matching See merge request gitlab/gitlabhq!2232 (cherry picked from commit 081aa1e91a777c9acb31be4a1e76b3dd7032fa9a) fa85a3fd Don't allow searching for partial user emails
\| *	Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ↵	Douwe Maan	2017-12-06	4	-11/+71
\|/ \| \| \| \| \| \| \| \| \| \|	'security-10-2' Fixes project visibility guidelines See merge request gitlab/gitlabhq!2226 (cherry picked from commit 877c42c0aaf3298d6001614c9706bc366ae4014c) e4fd1c26 Ensure project wiki visibility guidelines are met
*	Update VERSION to 10.2.3v10.2.3	Michael Kozono	2017-11-30	1	-1/+1
\|
*	Update CHANGELOG.md for 10.2.3	Michael Kozono	2017-11-30	11	-51/+19
\| \| \|	[ci skip]
*	Merge branch '10-2-stable-patch-3' into '10-2-stable'	Winnie Hellmann	2017-11-30	80	-281/+1549
\|\ \| \| \| \| \| \| \| \|	Prepare 10.2.3 release See merge request gitlab-org/gitlab-ce!15625
\| *	Merge branch 'gitaly-0.52.1' into '10-2-stable-patch-3'10-2-stable-patch-3	Winnie Hellmann	2017-11-29	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitaly 0.52.1 in 10-2-stable See merge request gitlab-org/gitlab-ce!15584
\| \| *	Use Gitaly 0.52.1gitaly-0.52.1	Jacob Vosmaer	2017-11-23	1	-1/+1
\| \| \|
\| * \|	Merge branch 'events-atom-feed-author-query' into 'master'	Douwe Maan	2017-11-29	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reuse authors when rendering event Atom feeds See merge request gitlab-org/gitlab-ce!15630 (cherry picked from commit a2fea9288ef0a2d714827ac5b92e7330d3cb2c3f) 63180167 Reuse authors when rendering event Atom feeds
\| * \|	Merge branch 'backport-epic-tasklist' into 'master'	Fatih Acet	2017-11-29	6	-42/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport epic tasklist See merge request gitlab-org/gitlab-ce!15556 (cherry picked from commit 59f93de0ba7c12575f95e4b7e6c313a09f98d52c) 6c2bc011 Backport epic tasklist dc92711b pick spec fixes from EE 0c0cb9e7 Fix spec
\| * \|	Merge branch 'default-values-for-mr-states' into 'master'	Sean McGivern	2017-11-29	5	-3/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix defaults for MR states and merge statuses Closes #40534 See merge request gitlab-org/gitlab-ce!15594 (cherry picked from commit 4976225209833899f632853ba7ab81b3c8ce239b) 4beacdb2 Fix defaults for MR states and merge statuses
\| * \|	Fix text utility conflicts	Clement Ho	2017-11-28	2	-21/+12
\| \| \|
\| * \|	Fix merge_requests/base_service.rb conflict	Felipe Artur	2017-11-28	1	-5/+0
\| \| \|
\| * \|	Merge branch 'optimise-stuck-ci-jobs-worker' into 'master'	Yorick Peterse	2017-11-28	5	-14/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimise StuckCiJobsWorker Closes gitlab-com/infrastructure#3260 See merge request gitlab-org/gitlab-ce!15527 (cherry picked from commit 420cdc6a5266df6de6767e3e3886e0019ae0ec6e) a26e25ea Optimise StuckCiJobsWorker d58bab4a Use not-ordered search 07c7ba1b Allow to drop jobs for deleted projects 6c1a4294 Fix stuck jobs tests
\| * \|	Merge branch 'backport-disable-autocomplete' into 'master'	Fatih Acet	2017-11-28	4	-3/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport disable autocomplete See merge request gitlab-org/gitlab-ce!15557 (cherry picked from commit 25a3a1838ab3224be0b6c658ea16fd1b37135372) fab9244c backport disable autocomplete
\| * \|	Merge branch 'backport-epic-fullscreen' into 'master'	Fatih Acet	2017-11-28	3	-68/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport epic fullscreen See merge request gitlab-org/gitlab-ce!15437 (cherry picked from commit 04ceeac1f6c56f1c1f3faa9da6e8bc563b6c1393) 880c9a2c Backport fix epic fullscreen