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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Bring web IDE docs to CEdocs-web-ide	Phil Hughes	2018-04-12	3	-0/+23
\|
*	Merge branch '42613-clean-up-old-project-permissions-frontend-code' into ↵	Clement Ho	2018-04-12	9	-418/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Clean up old project permissions frontend code" Closes #42613 See merge request gitlab-org/gitlab-ce!16818
\| *	Resolve "Clean up old project permissions frontend code"	Mike Greiling	2018-04-12	9	-418/+16
\|/
*	Merge branch '45287-align-icons' into 'master'	Phil Hughes	2018-04-12	2	-7/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Retry icon is misaligned in pipelines graph actions" Closes #45287 See merge request gitlab-org/gitlab-ce!18345
\| *	Align action icons in pipeline graph	Filipa Lacerda	2018-04-12	2	-7/+6
\| \|
* \|	Merge branch 'jousch/gitlab-ce-ci-untracked-doku-docs' into 'master'	Rémy Coutable	2018-04-12	1	-30/+49
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add dedicated info about artifacts:untracked to GitLab CI's README.md See merge request gitlab-org/gitlab-ce!18342
\| * \|	Add dedicated info about artifacts:untracked to GitLab CI's README.md	Josef Glatz	2018-04-12	1	-30/+49
\| \| \|
* \| \|	Merge branch '5103-mention-reply-by-email-in-user-docs' into 'master'	Achilleas Pipinellis	2018-04-12	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention reply-by-email in user doc Closes gitlab-ee#5103 See merge request gitlab-org/gitlab-ce!18310
\| * \| \|	Mention reply-by-email in user doc	Lin Jen-Shin	2018-04-12	1	-0/+5
\| \| \| \|
* \| \| \|	Merge branch 'workhorse-4-1-0' into 'master'	Douwe Maan	2018-04-12	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Workhorse to v4.1.0 See merge request gitlab-org/gitlab-ce!18327
\| * \| \| \|	Update GitLab Workhorse to v4.1.0	Nick Thomas	2018-04-12	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-update-instal-guide-10-7' into 'master'	James Lopez	2018-04-12	2	-1/+362
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates installation and update guides See merge request gitlab-org/gitlab-ce!18337
\| * \| \| \|	Fix indentation	Filipa Lacerda	2018-04-12	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Updates missing links	Filipa Lacerda	2018-04-12	1	-7/+7
\| \| \| \| \|
\| * \| \| \|	Updates installation and update guides	Filipa Lacerda	2018-04-12	2	-1/+362
\| \| \| \| \|
* \| \| \| \|	Merge branch '10-7-update-files' into 'master'	James Lopez	2018-04-12	19	-17/+81
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates See merge request gitlab-org/gitlab-ce!18338
\| * \| \| \|	Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates	Filipa Lacerda	2018-04-12	19	-17/+81
\| \|/ / /
* \| \| \|	Merge branch 'move-help-state-vue-component' into 'master'	Filipa Lacerda	2018-04-12	3	-25/+33
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move TimeTrackingHelpState vue component See merge request gitlab-org/gitlab-ce!18319
\| * \| \| \|	Move TimeTrackingHelpState vue component	George Tsiolis	2018-04-11	3	-25/+33
\| \| \| \| \|
* \| \| \| \|	Merge branch 'winh-dropdown-entry-unlocking' into 'master'	Phil Hughes	2018-04-12	2	-1/+6
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove green background from unlock button in admin area Closes #41269 See merge request gitlab-org/gitlab-ce!18288
\| * \| \| \|	Remove green background from unlock button in admin area	Winnie Hellmann	2018-04-10	2	-1/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Douwe Maan	2018-04-12	11	-19/+260
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'backport-of-rd-3429-enabling-maximum-file-size-limit-in-repository-causes-pushes-to-fail' into 'master' Backport of EE !4989 See merge request gitlab-org/gitlab-ce!18238
\| * \| \| \| \|	Backport of EE !4989backport-of-rd-3429-enabling-maximum-file-size-limit-in-repository-causes-pushes-to-fail	Rubén Dávila	2018-04-11	11	-19/+260
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rendering-markdown-multiple-projects' into 'master'	Douwe Maan	2018-04-12	38	-98/+254
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimise rendering of Markdown documents that belong to different projects See merge request gitlab-org/gitlab-ce!18157
\| * \| \| \| \| \|	Support Markdown rendering using multiple projectsrendering-markdown-multiple-projects	Yorick Peterse	2018-04-11	38	-98/+254
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This refactors the Markdown pipeline so it supports the rendering of multiple documents that may belong to different projects. An example of where this happens is when displaying the event feed of a group. In this case we retrieve events for all projects in the group. Previously we would group events per project and render these chunks separately, but this would result in many SQL queries being executed. By extending the Markdown pipeline to support this out of the box we can drastically reduce the number of SQL queries. To achieve this we introduce a new object to the pipeline: Banzai::RenderContext. This object simply wraps two other objects: an optional Project instance, and an optional User instance. On its own this wouldn't be very helpful, but a RenderContext can also be used to associate HTML documents with specific Project instances. This work is done in Banzai::ObjectRenderer and allows us to reuse as many queries (and results) as possible.
* \| \| \| \| \| \|	Merge branch '41436-use-simpler-env-vars-for-auto-devops-replicas' into 'master'	Achilleas Pipinellis	2018-04-12	2	-18/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Auto-Devops docs to mention new REPLICAS env var See merge request gitlab-org/gitlab-ce!18036
\| * \| \| \| \| \| \|	Update Auto-Devops docs to mention new REPLICAS env var	Dylan Griffith	2018-04-12	2	-18/+24
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master'	Marin Jankovski	2018-04-12	5	-3/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix empty state for build that does not have a trace Closes #45204 See merge request gitlab-org/gitlab-ce!18278
\| * \| \| \| \| \| \|	Fix tests for job empty states for a failed build	Grzegorz Bizon	2018-04-11	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Show build trace placeholder when build is running	Grzegorz Bizon	2018-04-11	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add a test for job empty state with missing trace	Grzegorz Bizon	2018-04-11	2	-1/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Revert adding `Empty` extended status to avoid N+1 queries	Grzegorz Bizon	2018-04-11	5	-59/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Extend specs for detailed build extended statuses	Grzegorz Bizon	2018-04-11	4	-6/+46
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix empty state for build that doesn ot have a trace	Grzegorz Bizon	2018-04-11	3	-1/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It also adds a fallback that covers other edge cases that might surface later.
* \| \| \| \| \| \| \|	Merge branch '45245-rspec-flaky-pruner-failure-job-failed-62392094' into ↵	Grzegorz Bizon	2018-04-12	2	-2/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "RSpec Flaky pruner failure / Job Failed #62392094" Closes #45245 See merge request gitlab-org/gitlab-ce!18316
\| * \| \| \| \| \| \| \|	Fix scripts/prune-old-flaky-specs requires Bundler to run	Rémy Coutable	2018-04-11	2	-2/+7
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'fix/wiki-find-file-gitaly' into 'master'	Robert Speicher	2018-04-11	4	-3/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix finding wiki file when Gitaly is enabled Closes gitaly#1126 See merge request gitlab-org/gitlab-ce!18317
\| * \| \| \| \| \| \| \|	Fix finding wiki file when Gitaly is enabled	Ahmad Sherif	2018-04-11	4	-3/+16
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitaly#1126
* \| \| \| \| \| \| \|	Merge branch 'mk/geo/backport-broadcast-message-cache-expiration-hook' into ↵	Nick Thomas	2018-04-11	2	-2/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [CE Backport] Propagate broadcast messages to secondaries See merge request gitlab-org/gitlab-ce!18324
\| * \| \| \| \| \| \| \|	Backport: Propagate broadcast messages to secondaries	Michael Kozono	2018-04-11	2	-2/+10
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'winh-protection-push-dropdowns-backport' into 'master'	Clement Ho	2018-04-11	3	-7/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit dropdown toggle width for protected branches / tags See merge request gitlab-org/gitlab-ce!18212
\| * \| \| \| \| \| \| \|	Limit dropdown toggle width for protected branches / tagswinh-protection-push-dropdowns-backport	Winnie Hellmann	2018-04-05	3	-7/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-sprintf-no-escape-docs' into 'master'	Clement Ho	2018-04-11	1	-3/+14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document example for sprintf without escaping See merge request gitlab-org/gitlab-ce!16712
\| * \| \| \| \| \| \| \| \|	Document example for sprintf without escaping	Winnie Hellmann	2018-04-11	1	-3/+14
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'unresolved-discussions-vue-component-i18n-and-tests' into 'master'	Clement Ho	2018-04-11	3	-34/+33
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add i18n and update specs for UnresolvedDiscussions vue component See merge request gitlab-org/gitlab-ce!17866
\| * \| \| \| \| \| \| \| \| \|	Add i18n and update specs for UnresolvedDiscussions vue component	George Tsiolis	2018-03-27	3	-34/+33
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '41748-vertical-misalignment-login-box' into 'master'	Clement Ho	2018-04-11	10	-32/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vertical misalignment of login box header Closes #41748 See merge request gitlab-org/gitlab-ce!16275
\| * \| \| \| \| \| \| \| \| \| \|	Refactor CSS to eliminate vertical misalignment of login nav	Takuya Noguchi	2018-04-11	10	-32/+21
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-single-karma-test' into 'master'	Clement Ho	2018-04-11	5	-13/+59
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add possibility to filter Karma spec files by path Closes #40899 See merge request gitlab-org/gitlab-ce!16102
\| * \| \| \| \| \| \| \| \| \| \| \|	use commander for safer cli argument parsing	Lukas Eipert	2018-04-11	4	-14/+23
\| \| \| \| \| \| \| \| \| \| \| \| \|