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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
* \|	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
\| \| \|
* \| \|	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-13	370	-1337/+1687
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 'issue_47709' into 'master'	Sean McGivern	2018-07-12	1	-0/+32
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+32
\| \| \| \|
\| * \| \|	Merge branch 'dz-manifest-import' into 'master'	Douwe Maan	2018-07-12	2	-0/+78
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add manifest import See merge request gitlab-org/gitlab-ce!20304
\| \| * \| \|	Add mysql and postgres spec for manifest import button	Dmitriy Zaporozhets	2018-07-11	1	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Improve manifest feature after backend review	Dmitriy Zaporozhets	2018-07-11	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Rename button at manifest import form	Dmitriy Zaporozhets	2018-07-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Make the manifest import feature spec a postgres only	Dmitriy Zaporozhets	2018-07-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Add feature specs for manifest import	Dmitriy Zaporozhets	2018-07-11	1	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Move manifest import to separate page and add feature specs	Dmitriy Zaporozhets	2018-07-11	2	-0/+36
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Merge branch 'ide-row-dropdown-design-update' into 'master'	Filipa Lacerda	2018-07-12	3	-13/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to new entry dropdowns in Web IDE Closes #44845 See merge request gitlab-org/gitlab-ce!20526
\| \| * \| \|	Improvements to new entry dropdowns in Web IDE	Phil Hughes	2018-07-11	3	-13/+3
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44845
\| * \| \|	Merge branch '48934' into 'master'	Mike Greiling	2018-07-11	3	-1/+20
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #48934 - Focus on text input on danger confirmation Closes #48934 See merge request gitlab-org/gitlab-ce!20435
\| \| * \| \|	Fix #48934 - Focus on text input on danger confirmation	Jamie Schembri	2018-07-06	3	-1/+20
\| \| \| \| \|
\| * \| \| \|	Merge branch '48237-toggle-file-comments' into 'master'	Phil Hughes	2018-07-11	1	-3/+3
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Toggle file comments in merge request does not update toggle buttons" Closes #48237 and #48537 See merge request gitlab-org/gitlab-ce!20452
\| \| * \ \ \	Merge branch 'master' into 48237-toggle-file-comments	Filipa Lacerda	2018-07-10	19	-39/+63
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (38 commits) Update bitbucket.md to fix typo and small grammar touchups. Update time_helper.rb to fix output for exact minutes. Document update for GitLab Pages users. Support manually stopping any environment from the UI Fix link to frontend in handbook Shorten CHANGELOG filename to avoid breaking ecryptfs users Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml Fix mountComponent helper path in docs Fix #48537 - Update avatar only via the projects API Add additional headline for Adding SSH keys to GitLab Request to be a proofreader. Fix specs Fix search bar text input alignment Fix API docs on unauthenticated projects return Adds with_projects optional parameter to /groups/:id API endpoint Docs: make it clear that you need a completely separate domain for Pages Document that we don't want to wait in tests Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor Remove useless return Use latest gitlab-styles ...
\| * \| \| \| \| \|	Resolve "Rename the `Master` role to `Maintainer`" Backend	Mark Chao	2018-07-11	234	-471/+471
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'revert-3755d828' into 'master'	Phil Hughes	2018-07-10	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'" See merge request gitlab-org/gitlab-ce!20525
\| \| * \| \| \| \|	Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"	Winnie Hellmann	2018-07-10	1	-1/+1
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \|	This reverts merge request !20140
\| * \| \| \| \|	Resolve "Disable GCP free credit banner at instance level"	Dennis Tang	2018-07-10	1	-0/+10
\| \|/ / / /
\| * \| \| \|	Support manually stopping any environment from the UI	Winnie Hellmann	2018-07-10	2	-10/+15
\| \| \| \| \|
\| * \| \| \|	Merge branch 'od/41671' into 'master'	Mike Greiling	2018-07-09	1	-0/+22
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preserve the correct start/due dates on milestones when editing Closes #41671 See merge request gitlab-org/gitlab-ce!20279
\| \| * \| \| \|	save current date before Pikaday init	Orlando Del Aguila	2018-06-29	1	-0/+22
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'update-rubocop'	Sean McGivern	2018-07-09	15	-26/+23
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| \| * \| \|	Use stable gitlab-styles and eliminate offenses	Lin Jen-Shin	2018-07-09	1	-1/+0
\| \| \| \| \|
\| \| * \| \|	Updates from `rubocop -a`	Lin Jen-Shin	2018-07-09	15	-25/+23
\| \| \| \| \|
\| * \| \| \|	Show "Sign in" instead of "Sign in / Register" when sign up is disabled	Dustin Utecht	2018-07-09	1	-0/+24
\| \|/ / /
\| * \| \|	add basic export to fix timeout problem on import_file_spec.rb	James Lopez	2018-07-07	1	-0/+0
\| \| \| \|
\| * \| \|	Merge branch '46246-gitlab-project-export-should-use-object-storage' into ↵	Sean McGivern	2018-07-06	2	-0/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	-0/+2
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Use proper markdown rendering for previews	Brett Walker	2018-07-06	2	-0/+27
\| \| \| \|
\| * \| \|	(Part 2) Resolve "Recognise when a user is trying to validate a private SSH key"	Luke Bennett	2018-07-06	1	-0/+14
\| \|/ /
\| * \|	Fix User role displayed on projects dashboard	Francisco Javier López	2018-07-06	1	-0/+28
\| \| \|
\| * \|	Resolve "When editing a comment in an issue, the preview mode is toggled in ↵	Constance Okoghenun	2018-07-05	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \|	the main textarea"
\| * \|	Close revoke deploy token modal on escape keypress	George Tsiolis	2018-07-05	1	-0/+25
\| \| \|
\| * \|	Enable Capybara/FeatureMethods cop	Winnie Hellmann	2018-07-05	194	-791/+797
\| \| \|
\| * \|	fix failing spec test in gcp_spec	Dennis Tang	2018-07-04	1	-1/+1
\| \| \|
\| * \|	Merge branch '45739-add-metrics-to-operations-tab' into 'master'	Filipa Lacerda	2018-07-04	1	-0/+8
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add Metrics to Operations Tab" Closes #45739 See merge request gitlab-org/gitlab-ce!20025
\| \| * \|	Fix metrics shortcut	Jose	2018-06-26	1	-1/+1
\| \| \| \|
\| \| * \|	Specify environment actions to distinguish between metrics and every other ↵	Tiago Botelho	2018-06-26	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	environment related actions
\| * \| \|	Merge branch '19468-add_readme_when_creating_project' into 'master'	Douwe Maan	2018-07-04	1	-0/+9
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add option to add README when creating a project Closes #19468 See merge request gitlab-org/gitlab-ce!20335
\| \| * \| \|	Add option to add README when creating a project	Imre Farkas	2018-07-04	1	-0/+9
\| \| \| \| \|
\| * \| \| \|	Merge branch '43446-new-cluster-page-tabs' into 'master'	Kamil Trzciński (OoO till 3th)	2018-07-04	3	-7/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Change new cluster page design to use tabs" Closes #43446 and #46304 See merge request gitlab-org/gitlab-ce!18963