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

	Commit message (Collapse)	Author	Age	Files	Lines
*	update nodemon	Mike Greiling	2018-02-20	2	-191/+199
\|
*	upgrade various webpack plugins	Mike Greiling	2018-02-20	2	-172/+324
\|
*	approve change in dependencies	Mike Greiling	2018-02-20	1	-2/+8
\|
*	upgrade webpack and webpack-dev-server	Mike Greiling	2018-02-20	2	-53/+856
\|
*	Merge branch 'docs-link-to-custom-issue-tracker' into 'master'	Sean McGivern	2018-02-20	1	-0/+2
\|\ \| \| \| \| \| \| \| \|	Docs update: Link to custom issue tracker See merge request gitlab-org/gitlab-ce!17242
\| *	Update custom_issue_tracker.mddocs-link-to-custom-issue-tracker	Victor Wu	2018-02-20	1	-0/+2
\| \|
* \|	Merge branch 'zj-unit-test-gitaly-arrays' into 'master'	Sean McGivern	2018-02-20	2	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add unit tests for Gitaly types See merge request gitlab-org/gitlab-ce!17237
\| * \|	Add unit tests for Gitaly typeszj-unit-test-gitaly-arrays	Zeger-Jan van de Weg	2018-02-20	2	-0/+5
\| \| \|
* \| \|	Merge branch '43427-generate-ee-changelog-items-in-ee-changelogs' into 'master'	Robert Speicher	2018-02-20	2	-4/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Change `bin/changelog` to generate EE changelog items in `ee/changelogs`" Closes #43427 See merge request gitlab-org/gitlab-ce!17238
\| * \| \|	Generate EE changelog under ee/changelogs/unreleased/	Rémy Coutable	2018-02-20	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'revert-828357fb' into 'master'	Douwe Maan	2018-02-20	1	-1/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'zj-n-1-root-show' into 'master'" See merge request gitlab-org/gitlab-ce!17243
\| * \| \| \|	Revert "Merge branch 'zj-n-1-root-show' into 'master'"	Zeger-Jan van de Weg	2018-02-20	1	-1/+4
\| \|/ / / \| \| \| \| \| \| \| \|	This reverts merge request !16968
* \| \| \|	Merge branch 'fix-diff-flash' into 'master'	Clement Ho	2018-02-20	1	-1/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	only show error if there is an error See merge request gitlab-org/gitlab-ce!17228
\| * \| \|	only show error if there is an errorfix-diff-flash	Simon Knox	2018-02-20	1	-1/+3
\| \| \| \|
* \| \| \|	Merge branch 'docs-comm-article-phoenix-app-gitlab-ci' into 'master'	Marcia Ramos	2018-02-20	9	-55/+428
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: comm article Phoenix App with GitLab CI/CD See merge request gitlab-org/gitlab-ce!16776
\| * \| \| \|	Docs: comm article Phoenix App with GitLab CI/CD	Marcia Ramos	2018-02-20	9	-55/+428
\|/ / / /
* \| \| \|	Merge branch 'docs-pages-refactor-article-series' into 'master'	Achilleas Pipinellis	2018-02-20	6	-97/+53
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Pages - clean up articles See merge request gitlab-org/gitlab-ce!17188
\| * \| \| \|	Docs: Pages - clean up articles	Marcia Ramos	2018-02-20	6	-97/+53
\|/ / / /
* \| \| \|	Merge branch '43424-put_all_event_metrics_behind_feature_flags' into 'master'	Douwe Maan	2018-02-20	1	-2/+3
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for sidekiq metrics set cardinality growing unbounded Closes #43424 See merge request gitlab-org/gitlab-ce!17235
\| * \| \|	Only use features for events	Pawel Chojnacki	2018-02-20	1	-3/+3
\| \| \| \|
\| * \| \|	Put all event metrics exposed to prometheus behind a feature flag	Pawel Chojnacki	2018-02-20	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch ↵	Achilleas Pipinellis	2018-02-20	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43376-follow-up-from-docs-update-all-articles-with-the-new-layout-metadata-from-the-frontmatter' into 'master' Resolve "Follow-up from "Docs: Update all articles with the new layout (metadata from the frontmatter)"" Closes #43376 See merge request gitlab-org/gitlab-ce!17214
\| * \| \| \|	specify date format43376-follow-up-from-docs-update-all-articles-with-the-new-layout-metadata-from-the-frontmatter	Marcia Ramos	2018-02-19	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/lfs-lock' into 'master'	Marcia Ramos	2018-02-20	1	-1/+3
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add version which LFS lock was introduced See merge request gitlab-org/gitlab-ce!17233
\| * \| \| \|	Add version which LFS lock was introduceddocs/lfs-lock	Achilleas Pipinellis	2018-02-20	1	-1/+3
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'move-spintach-project-network-graph-to-rspec' into 'master'	Rémy Coutable	2018-02-20	3	-162/+108
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move spinach project network graph tests to RSpec See merge request gitlab-org/gitlab-ce!17171
\| * \| \| \|	Move spinach project network graph tests to RSpec	Semyon Pupkov	2018-02-16	3	-162/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \|	Merge branch 'remove-unnecessary-validate-project' into 'master'	Kamil Trzciński	2018-02-20	3	-3/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unecessary validate: true from belongs_to :project See merge request gitlab-org/gitlab-ce!17166
\| * \| \| \| \|	Remove unecessary validate: true from belongs_to :projectremove-unnecessary-validate-project	Dylan Griffith	2018-02-20	3	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This does not seem to serve any clear purpose and causes other issues (see https://gitlab.com/gitlab-org/gitlab-ce/issues/43196#note_59275652)
* \| \| \| \| \|	Merge branch 'remove-chart-show-bundle' into 'master'	Phil Hughes	2018-02-20	11	-29/+9
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove graphs_show.js webpack bundle See merge request gitlab-org/gitlab-ce!17194
\| * \| \| \| \|	fix broken specsremove-chart-show-bundle	Mike Greiling	2018-02-19	4	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	remove common_d3 bundle	Mike Greiling	2018-02-19	3	-15/+0
\| \| \| \| \| \|
\| * \| \| \| \|	remove graphs_show webpack bundle	Mike Greiling	2018-02-19	6	-9/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-over-testing' into 'master'	Rémy Coutable	2018-02-19	2	-50/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extraneous tests from Issues API spec Closes #25201 See merge request gitlab-org/gitlab-ce!17222
\| * \| \| \| \| \|	Remove extraneous tests from Issues API specrs-over-testing	Robert Speicher	2018-02-19	2	-50/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These were all testing an implementation detail of `Issues::UpdateService` which is already well-tested and doesn't need to be re-tested here. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25201
* \| \| \| \| \| \|	Merge branch 'docs/rs-changelog-doc-links' into 'master'	Rémy Coutable	2018-02-19	1	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update two links in the changelog developer docs See merge request gitlab-org/gitlab-ce!17220
\| * \| \| \| \| \|	Update two links in the changelog developer docsdocs/rs-changelog-doc-links	Robert Speicher	2018-02-18	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'chart.html.haml-refactor' into 'master'43411-update-postgresql-ha-docs	Clement Ho	2018-02-19	37	-3533/+51
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Chart.html.haml refactor See merge request gitlab-org/gitlab-ce!16897
\| * \| \| \| \| \|	Chart.html.haml refactor	Jacob Schatz	2018-02-19	37	-3533/+51
\|/ / / / / /
* \| \| \| \| \|	Merge branch '4826-github-import-wiki-fix-1' into 'master'	Nick Thomas	2018-02-19	3	-2/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[GH Import] Create an empty wiki if wiki import failed Closes #43020 See merge request gitlab-org/gitlab-ce!17112
\| * \| \| \| \| \|	[GH Import] Create an empty wiki if wiki import failed	Valery Sizov	2018-02-19	3	-2/+12
\|/ / / / / /
* \| \| \| \| \|	Merge branch '42274-group-request-membership-long-too' into 'master'	Rémy Coutable	2018-02-19	5	-78/+114
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "group request membership mail with too long list of "To:"" Closes #42274 See merge request gitlab-org/gitlab-ce!17121
\| * \| \| \| \| \|	Resolve "group request membership mail with too long list of "To:""	🙈 jacopo beschi 🙉	2018-02-19	5	-78/+114
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'kp-fix-stacked-bar-progress-value-clipping' into 'master'	Filipa Lacerda	2018-02-19	2	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix single digit value clipping for stacked progress bar Closes gitlab-ee#4864 See merge request gitlab-org/gitlab-ce!17217
\| * \| \| \| \| \|	Add changelog entrykp-fix-stacked-bar-progress-value-clipping	Kushal Pandya	2018-02-19	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix single digit value clipping	Kushal Pandya	2018-02-19	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'	Sean McGivern	2018-02-19	3	-5/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid slow File Lock checks when not used Closes #43339 See merge request gitlab-org/gitlab-ce!17140
\| * \| \| \| \| \|	Avoid slow File Lock checks when not used	James Edwards-Jones	2018-02-19	3	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also avoid double commit lookup during file lock check by reusing memoized commits.
* \| \| \| \| \| \|	Merge branch 'flipper-caching' into 'master'	Douwe Maan	2018-02-19	2	-1/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase feature flag cache TTL to one hour Closes #40854 See merge request gitlab-org/gitlab-ce!17213
\| * \| \| \| \| \|	Increase feature flag cache TTL to one hour	Yorick Peterse	2018-02-19	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Flipper already takes care of flushing cache entries when enabling/disabling features so it should be safe to increase the TTL. This in turn should drastically reduce the number of Flipper queries executed. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/40854