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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '_acet-fix-outdated-discussions' into 'master'	Tim Zallmann	2018-07-18	5	-0/+69
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix showing outdated discussions on Changes tab. Closes #48167 See merge request gitlab-org/gitlab-ce!20445
\| *	Fix showing outdated discussions on Changes tab_acet-fix-outdated-discussions	Fatih Acet	2018-07-18	5	-0/+69
\| \|
* \|	Merge branch '27456-improve-feedback-when-dev-cannot-push-to-empty-repo' ↵	Douwe Maan	2018-07-18	1	-0/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Improve feedback when a developer cannot push in an empty repository Closes #27456 See merge request gitlab-org/gitlab-ce!20519
\| * \|	Improves remote message when a developer is unable to push in an empty ↵27456-improve-feedback-when-dev-cannot-push-to-empty-repo	Tiago Botelho	2018-07-18	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \|	repository
* \| \|	Merge branch 'rd-48920-backend-support-for-clarifying-search-bar' into 'master'	Douwe Maan	2018-07-18	1	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add avatar_url attr to the response of the autocomplete endpoint Closes #48920 See merge request gitlab-org/gitlab-ce!20661
\| * \| \|	Add avatar_url attr to the response of the autocomplete endpoint	Rubén Dávila	2018-07-17	1	-0/+14
\| \| \| \|
* \| \| \|	Remove unreachable Git code	Jacob Vosmaer (GitLab)	2018-07-18	5	-58/+35
\| \| \| \|
* \| \| \|	Merge branch 'osw-fallback-to-collection-when-no-diff-refs' into 'master'	Sean McGivern	2018-07-18	2	-0/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render MR page when no persisted diff_refs or diffs size Closes #49342 See merge request gitlab-org/gitlab-ce!20680
\| * \| \| \|	Render MR page when no persisted diff_refs or diffs size	Oswaldo Ferreira	2018-07-18	2	-0/+25
\| \| \| \| \|
* \| \| \| \|	Merge branch '45318-FE-junit-tests' into 'master'	Phil Hughes	2018-07-18	5	-0/+327
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backports security reusable components into CE to use in JUnit report See merge request gitlab-org/gitlab-ce!20613
\| * \| \| \| \|	Removes commented code45318-FE-junit-tests	Filipa Lacerda	2018-07-17	1	-17/+0
\| \| \| \| \| \|
\| * \| \| \| \|	[ci skip] Merge branch 'master' into 45318-FE-junit-tests	Filipa Lacerda	2018-07-16	25	-204/+399
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (49 commits) Add changelog entry Fix `transform` typo Fix archived parameter for projects API Enable frozen string in apps/uploaders/*.rb 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 SubmoduleHelper - Project is not always available as an instance variable 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 ...
\| * \| \| \| \|	Backports security reports reusable components into CE code base	Filipa Lacerda	2018-07-13	5	-0/+344
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '47419-Fix-breadcrumbs' into 'master'	Phil Hughes	2018-07-18	1	-0/+38
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "broken breadcrumb in admin/user when switching tabs" Closes #47419 See merge request gitlab-org/gitlab-ce!19608
\| * \| \| \| \| \|	Fix broken breadcrumb in admin/user	Robin Naundorf	2018-07-17	1	-0/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix broken breadcrumb when switching tabs in admin/user Closes #47419
* \| \| \| \| \| \|	Features/show project id on home panel	Tuğçe Nur Taş	2018-07-18	1	-34/+87
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jivl-dev-master-into-com-master	Jose	2018-07-17	1	-0/+7
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	jivl-dev-master-into-com-master
\| * \| \| \| \| \|	Merge branch 'fix-issue-49133' into 'master'	José Iván Vargas López	2018-07-17	1	-0/+7
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix symlink vulnerability in project import See merge request gitlab/gitlabhq!2440
\| \| * \| \| \| \| \|	Fix symlink vulnerability in project import	Stan Hu	2018-07-17	1	-0/+7
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49133
* \| \| \| \| \| \|	Resolve "Metrics drop down doesn't show all environment, some not clickable"	Jose Ivan Vargas	2018-07-17	2	-1/+23
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into ↵	Douwe Maan	2018-07-17	4	-0/+92
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Include full image URL in webhooks for uploaded images Closes #20720 See merge request gitlab-org/gitlab-ce!18109
\| * \| \| \| \| \|	Keep #absolute_image_urls as a private instance method	Sean McGivern	2018-07-17	1	-2/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Simplify WikiPage#hook_attrs spec	Sean McGivern	2018-07-17	1	-6/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_url	Sean McGivern	2018-07-06	566	-4989/+11635
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Add documentation and specs for webhook URL rewriting	Sean McGivern	2018-07-06	1	-0/+56
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add base class for hook builders, and use it for notes and wikis	Sean McGivern	2018-06-20	1	-8/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix hook data specs	Sean McGivern	2018-06-20	4	-11/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Passing absolute image urls in the markdown content in the webhooks	Satish Perala	2018-06-20	4	-0/+37
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Resolve "MR: Reduce the memory footprint of the component tree"	Tim Zallmann	2018-07-17	4	-3/+22
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'zj-remove-sanitize-repo-path' into 'master'	Sean McGivern	2018-07-17	1	-27/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove sanitize_repo_path Closes gitaly#1235 See merge request gitlab-org/gitlab-ce!20666
\| * \| \| \| \| \| \| \|	Remove sanitize_repo_path	Zeger-Jan van de Weg	2018-07-17	1	-27/+0
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method is unneeded given its been pushed to Gitaly, through https://gitlab.com/gitlab-org/gitaly/merge_requests/780 Closes https://gitlab.com/gitlab-org/gitaly/issues/1235
* \| \| \| \| \| \| \|	Merge branch 'close-revert-and-cherry-pick-modal-on-escape-keypress' into ↵	Rémy Coutable	2018-07-17	3	-4/+47
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Close revert and cherry pick modal on escape keypress See merge request gitlab-org/gitlab-ce!20341
\| * \| \| \| \| \| \|	Merge cherry-pick modal specs	George Tsiolis	2018-07-17	3	-28/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add spec for closing cherry-pick modal on escape keypress	George Tsiolis	2018-07-17	3	-4/+29
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add spec for closing revert modal on escape keypress	George Tsiolis	2018-07-17	1	-0/+25
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '14995-custom_wiki_sidebar' into 'master'	Sean McGivern	2018-07-17	2	-4/+58
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement customized sidebar Closes #14995 See merge request gitlab-org/gitlab-ce!17940
\| * \| \| \| \| \| \|	So we still want to have More Pages button	Lin Jen-Shin	2018-07-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebar	Lin Jen-Shin	2018-07-16	26	-196/+409
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	833	-6250/+10446
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	123	-1571/+2814
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	14995-custom_wiki_sidebar
\| * \| \| \| \| \| \| \| \| \|	There's no point to test customized sidebar with empty wiki	Lin Jen-Shin	2018-06-27	1	-10/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebar	Lin Jen-Shin	2018-06-27	1657	-35820/+71805
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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/+16
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Rearrange the tests and add another case where	Lin Jen-Shin	2018-03-26	1	-15/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it would still render the sidebar whenever the wiki is empty.
\| * \| \| \| \| \| \| \| \| \| \|	Add test for sidebar and cleanup wiki tests	Lin Jen-Shin	2018-03-23	1	-3/+38
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/gb/email-delivery-metrics' into 'master'	Sean McGivern	2018-07-17	4	-4/+41
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add emails delivery metrics Closes #49214 See merge request gitlab-org/gitlab-ce!20638
\| * \| \| \| \| \| \| \| \| \| \|	Update notification specs after renaming a class	Grzegorz Bizon	2018-07-16	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Implement action mailer delivery metrics observer	Grzegorz Bizon	2018-07-16	1	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Move existing email interceptors into the same module	Grzegorz Bizon	2018-07-16	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-project-api-archived' into 'master'	Rémy Coutable	2018-07-16	1	-0/+33
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix archived parameter for projects API Closes #32301 See merge request gitlab-org/gitlab-ce!20566