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

	Commit message (Collapse)	Author	Age	Files	Lines
*	WIP parallel DB migrationsparallel-db-migrations	Yorick Peterse	2018-07-18	1	-0/+4
\|
*	Render MR page when no persisted diff_refs or diffs size	Oswaldo Ferreira	2018-07-18	1	-1/+1
\|
*	Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into ↵	Douwe Maan	2018-07-17	2	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Include full image URL in webhooks for uploaded images Closes #20720 See merge request gitlab-org/gitlab-ce!18109
\| *	Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_url	Sean McGivern	2018-07-06	26	-85/+225
\| \|\
\| * \|	Add base class for hook builders, and use it for notes and wikis	Sean McGivern	2018-06-20	2	-6/+2
\| \| \|
\| * \|	Passing absolute image urls in the markdown content in the webhooks	Satish Perala	2018-06-20	2	-2/+6
\| \| \|
* \| \|	Merge branch 'gitaly-issue-cross-reference' into 'master'	Sean McGivern	2018-07-17	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cross-link to N+1 issue See merge request gitlab-org/gitlab-ce!20663
\| * \| \|	Add cross-link to N+1 issue	Jacob Vosmaer	2018-07-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci-skip]
* \| \| \|	Merge branch '14995-custom_wiki_sidebar' into 'master'	Sean McGivern	2018-07-17	1	-0/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement customized sidebar Closes #14995 See merge request gitlab-org/gitlab-ce!17940
\| * \| \|	Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebar	Lin Jen-Shin	2018-07-16	4	-7/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (53 commits) Fix invalid link to GitLab.com architecture.md i18n: externalize strings from 'app/views/import' Remove Repository#lookup and unreachable rugged code refactor code based on feedback Trigger rails5 tests either by variable or ref name Fix link in help doc which was linking to old mono-repo, now in its own repo Allow Danger step to fail update webpack to v4.16 Backport logger changes from EE Add the CI Job trigger as the build trigger Remove flaky and redundant expectations use fileuploader dynamic path method in uploads manager and add spec fix typo in uploads manager add small comment to download method in uploads manager refactor uploads manager Update 10.6-to-10.7.md Lazy-load performance bar UI Update .gitlab-ci.yml fixed test to correctly text relative URLs doesnt add query param if source & target projects match Add changelog entry ...
\| * \ \ \	Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebar	Lin Jen-Shin	2018-07-13	34	-198/+428
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (467 commits) Update docs board features tier Upgrade grape-path-helpers to 1.0.6 Remove healthchecks from prometheus endpoint Fix find_branch call sites Ensure Encoding.default_external is set to UTF-8 when running QA scenarios i18n: externalize strings from 'app/views/admin/groups' Backport mr widget changes from EE Allow to toggle notifications for issues due soon Vuex test helper improvements whitespace Make more ref RPC's mandatory Resolve "Improve performance of MR Changes tab: reduce event listeners on scroll event" Remove old service architecture from Vue docs Adding spec to test basic forking functionalities Fix performance problem of accessing tag list for projects api endpoints typo Add sleep to QA test before installing tiller Include Vue files that are not covered by tests in test coverage Remove Repository#path memoization Resolve "do not set updated_at when creating note" ...
\| * \ \ \ \	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Andreas Kämmerle	2018-07-02	4	-15/+21
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	14995-custom_wiki_sidebar
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebar	Lin Jen-Shin	2018-06-27	144	-811/+3265
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (4180 commits) Enable frozen string literals for app/workers/*.rb Resolve "Search dropdown hides & shows when typing" Revert merge request widget button max height Update CHANGELOG.md for 11.0.2 Update external link icon in header user dropdown Added Diff Viewer to new VUE based MR page Fixed eslint failure in IDE spec helpers Use refs instead of querySelector. Show file in tree on WebIDE open Resolve "Remove unused bootstrap component CSS" Resolve "Explain what Groups are in the New Group page" [QA] Make sure we wait for the deploy key list to load Update _scopes_form.html.haml to remove duplicate information Use the branch instead of the tag to install port the EE changes Add index on deployable_type/id for deployments Add a helper to rename a column using a background migration Fix performance bottleneck when rendering large wiki pages Port Namespace#root_ancestor to CE Remove duplicate spec ...
\| * \| \| \| \| \| \|	Introduce #find_sidebar and use a constant to find the page14995-custom_wiki_sidebar	Lin Jen-Shin	2018-03-26	1	-0/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Migrate merge base, merged branches, write ref	Jacob Vosmaer (GitLab)	2018-07-17	1	-4/+6
\| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/gb/rename-environments-stop-actions' into 'master'	Kamil Trzciński	2018-07-16	2	-5/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it more explicit what environment stop actions are Closes #48672 See merge request gitlab-org/gitlab-ce!20587
\| * \| \| \| \| \| \|	Remove unused `stop_action?` method from deployment classfix/gb/rename-environments-stop-actions	Grzegorz Bizon	2018-07-12	1	-4/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename environments stop action method	Grzegorz Bizon	2018-07-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it more explicit that an environment is not a stop action, but instead is merely contains a stop action.
* \| \| \| \| \| \| \|	Merge branch 'fix/gb/fix-project-settings-build-time-validation' into 'master'	Kamil Trzciński	2018-07-13	1	-2/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve project build time setting validation Closes #44443 See merge request gitlab-org/gitlab-ce!20591
\| * \| \| \| \| \| \| \|	Improve project build time setting validation	Grzegorz Bizon	2018-07-12	1	-2/+4
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix/gb/add-missing-before-sha-predefined-variable' into 'master'	Kamil Trzciński	2018-07-13	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing `CI_COMMIT_BEFORE_SHA` predefined variable Closes #43365 See merge request gitlab-org/gitlab-ce!20594
\| * \| \| \| \| \| \|	Add missing `CI_COMMIT_BEFORE_SHA` predefined variable	Grzegorz Bizon	2018-07-12	1	-0/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'gitaly-mandatory-20180712-jv' into 'master'	Sean McGivern	2018-07-13	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make more ref RPC's mandatory Closes gitaly#526, gitaly#965, gitaly#476, and gitaly#474 See merge request gitlab-org/gitlab-ce!20592
\| * \| \| \| \| \| \|	Fix find_branch call sitesgitaly-mandatory-20180712-jv	Jacob Vosmaer	2018-07-12	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'issue_47709' into 'master'	Sean McGivern	2018-07-12	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to toggle notifications for issues due soon Closes #47709 See merge request gitlab-org/gitlab-ce!20530
\| * \| \| \| \| \| \|	Allow to toggle notifications for issues due soon	Felipe Artur	2018-07-12	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Optimize ProjectWiki#empty? check	Stan Hu	2018-07-12	1	-1/+4
\| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `empty?` check was iterating over all Wiki pages to determine whether it was empty. Using the limit parameter allows us to bail out early once we found a page. Note that this currently only improves performance for GitLab 11.0 until https://gitlab.com/gitlab-org/gitaly/issues/1204 is fixed. Relates to #40101
* \| \| \| \| \| \|	Revert "Merge branch 'ee-5481-epic-todos' into 'master'"	Jarka Kadlecová	2018-07-11	5	-27/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489.
* \| \| \| \| \| \|	Resolve "Rename the `Master` role to `Maintainer`" Backend	Mark Chao	2018-07-11	9	-33/+60
\|/ / / / / /
* \| \| \| \| \|	Resolve "Disable GCP free credit banner at instance level"	Dennis Tang	2018-07-10	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'improve-metadata-access-performance' into 'master'	Grzegorz Bizon	2018-07-10	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve metadata access performance See merge request gitlab-org/gitlab-ce!20493
\| * \| \| \| \| \|	Access metadata directly from Object Storage	Kamil Trzciński	2018-07-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously we would pull the file, now, we just stream-it as needed from Object Storage
* \| \| \| \| \| \|	Resolve Naming/UncommunicativeMethod	Lin Jen-Shin	2018-07-09	3	-9/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Use stable gitlab-styles and eliminate offenses	Lin Jen-Shin	2018-07-09	1	-2/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Updates from `rubocop -a`	Lin Jen-Shin	2018-07-09	6	-8/+8
\|/ / / / / /
* \| \| \| \| \|	Merge branch ↵	Stan Hu	2018-07-07	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'48670-application-settings-may-not-be-invalidated-if-migrations-are-run' into 'master' Resolve "Application settings may not be invalidated if migrations are run" Closes #48670 See merge request gitlab-org/gitlab-ce!20389
\| * \| \| \| \| \|	Stop relying on migrations in the CacheableAttributes cache key and cache ↵	Rémy Coutable	2018-07-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	attributes for 1 minute instead Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '46246-gitlab-project-export-should-use-object-storage' into ↵	Sean McGivern	2018-07-06	2	-7/+26
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "GitLab Project export should use object storage" Closes #46246 See merge request gitlab-org/gitlab-ce!20105
\| * \| \| \| \| \| \|	Update Import/Export to use object storage (based on aa feature flag)	James Lopez	2018-07-06	2	-7/+26
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Use proper markdown rendering for previews	Brett Walker	2018-07-06	2	-10/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'gitaly-dont-use-path' into 'master'	Sean McGivern	2018-07-06	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove silly use of repo disk path See merge request gitlab-org/gitlab-ce!20436
\| * \| \| \| \| \| \|	Remove silly use of repo disk path	Jacob Vosmaer	2018-07-06	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'bvl-preload-parents-after-pagination' into 'master'	Douwe Maan	2018-07-06	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preload ancestors after pagination when filtering Closes #40785 See merge request gitlab-org/gitlab-ce!20398
\| * \| \| \| \| \| \|	Preload ancestors after pagination when filtering	Bob Van Landuyt	2018-07-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to preload the ancestors of search results after applying pagination limits. This way the search results itself are paginated, but not the ancestors. If we don't do this, we might not preload a parent group of a search result as it has been cut off by pagination.
* \| \| \| \| \| \| \|	Merge branch ↵	Yorick Peterse	2018-07-06	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-expression-1-of-select-list-is-not-in-group-by-clause' into 'master' [Rails5] Fix milestone GROUP BY query Closes #48428 See merge request gitlab-org/gitlab-ce!20256
\| * \| \| \| \| \| \|	[Rails5] Fix milestone GROUP BY query	blackst0ne	2018-07-06	1	-1/+2
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'build-chunks-on-object-storage' into 'master'	Grzegorz Bizon	2018-07-06	4	-85/+203
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to store BuildTraceChunks on Object Storage Closes #45712 See merge request gitlab-org/gitlab-ce!19515
\| * \| \| \| \| \|	Merge branch 'master' into build-chunks-on-object-storage	Shinya Maeda	2018-07-06	13	-32/+95
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Decouple optimization for erasing trace	Shinya Maeda	2018-07-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename retry_max left overs to retries	Shinya Maeda	2018-07-04	1	-1/+1
\| \| \| \| \| \| \| \|