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

	Commit message (Collapse)	Author	Age	Files	Lines
*	:white_check_mark: store specside-improve-error-messages	Phil Hughes	2018-06-26	4	-2/+109
\|
*	:face_palm: fixed error message	Phil Hughes	2018-06-26	1	-1/+1
\|
*	:speech_balloon: improve text in error message	Phil Hughes	2018-06-26	1	-3/+3
\|
*	use classes intead of adding more styles	Phil Hughes	2018-06-26	1	-7/+1
\|
*	make error messages a first class citizen in Web IDE	Phil Hughes	2018-06-26	7	-19/+107
\| \| \| \| \|	This is to reduce the dependancy on the flash module which just modifies the DOM, whereas this now correcly uses the vDOM
*	fixed eslint	Phil Hughes	2018-06-26	2	-3/+1
\|
*	Improve branch 404 error in Web IDE	Phil Hughes	2018-06-26	4	-20/+75
\| \| \| \|	Part of #47323
*	Merge branch 'issue_47729' into 'master'	Sean McGivern	2018-06-26	6	-4/+134
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix refresh cache for open issues count service Closes #47945 See merge request gitlab-org/gitlab-ce!19904
\| *	BatchOpenIssuesCount only updates public issues countissue_47729	Felipe Artur	2018-06-25	3	-16/+19
\| \|
\| *	Fix refresh cache for open issues count service	Felipe Artur	2018-06-21	7	-7/+134
\| \|
* \|	Merge branch 'unify-some-models' into 'master'	Douwe Maan	2018-06-26	3	-1/+18
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE: Move some EE only codes in models to their EE modules See merge request gitlab-org/gitlab-ce!20160
\| * \|	Port Namespace#root_ancestor to CE	Lin Jen-Shin	2018-06-26	2	-0/+17
\| \| \|
\| * \|	Bring changes from EEunify-some-models	Lin Jen-Shin	2018-06-26	1	-1/+1
\| \| \|
* \| \|	Merge branch 'patch-28' into 'master'	Rémy Coutable	2018-06-26	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update wrong initial setting transfer in application_settings_controller.rb See merge request gitlab-org/gitlab-ce!20059
\| * \| \|	Fix initial settings loading at the first run of GitLab installed from source	Andrei Vukolov	2018-06-25	1	-1/+1
\| \| \| \|
\| * \| \|	Update wrong initial setting transfer in application_settings_controller.rb	Andrei Vukolov	2018-06-21	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'dropdown-fix' into 'master'	Phil Hughes	2018-06-26	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Css fix for search dropdown overflow issue. See merge request gitlab-org/gitlab-ce!20011
\| * \| \| \|	Fix for search dropdown scrollbar issue.	İsmail Hakkı Ayaz	2018-06-19	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'i18n-extract-app/views/shared-boards' into 'master'	Rémy Coutable	2018-06-26	5	-21/+21
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n: externalize strings from 'app/views/shared/boards' See merge request gitlab-org/gitlab-ce!19934
\| * \| \| \| \|	i18n: externalize strings from 'app/views/shared/boards'	Tao Wang	2018-06-16	5	-21/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tao Wang <twang2218@gmail.com>
* \| \| \| \| \|	Merge branch 'add-proofreader' into 'master'	Rémy Coutable	2018-06-26	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Hiroyuki Sato as a Japanese proofreader See merge request gitlab-org/gitlab-ce!20134
\| * \| \| \| \| \|	Add Hiroyuki Sato as a Japanese proofreader	Hiroyuki Sato	2018-06-25	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'update_project_flash_error_message' into 'master'	Rémy Coutable	2018-06-26	2	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set flash error message only for current request when updating project Closes #43772 See merge request gitlab-org/gitlab-ce!20126
\| * \| \| \| \| \| \|	Set flash error message only for current request when updating project	Aram Visser	2018-06-25	2	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-contributing-links' into 'master'	Achilleas Pipinellis	2018-06-26	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update CONTRIBUTING.md to fix links See merge request gitlab-org/gitlab-ce!19814
\| * \| \| \| \| \| \| \|	Update CONTRIBUTING.md to fix links	Marcel Amirault	2018-06-14	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'existing-gcp-accounts' into 'master'	Mike Greiling	2018-06-25	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add back copy for existing gcp accounts within offer banner See merge request gitlab-org/gitlab-ce!20159
\| * \| \| \| \| \| \| \| \|	Add back copy for existing gcp accounts within offer bannerexisting-gcp-accounts	tauriedavis	2018-06-25	2	-1/+6
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2018-06-25	3	-6/+21
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'48339-sorting-by-name-on-explore-projects-page-renders-a-500-error-when-logged-in' into 'master' Resolve "Sorting by name on explore projects page renders a 500 error when logged in" Closes #48339 See merge request gitlab-org/gitlab-ce!20162
\| * \| \| \| \| \| \| \| \|	Add CHANGELOG	Douglas Barbosa Alexandre	2018-06-25	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix sorting by name on explore projects page	Douglas Barbosa Alexandre	2018-06-25	2	-6/+16
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'changelog-code-style' into 'master'	Robert Speicher	2018-06-25	2	-19/+41
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve shelling out in bin/changelog See merge request gitlab-org/gitlab-ce!18977
\| * \| \| \| \| \| \| \| \| \|	Improve shelling out in bin/changelog	Jacob Vosmaer (GitLab)	2018-06-25	2	-19/+41
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-alert-btn' into 'master'	Mike Greiling	2018-06-25	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix alert button styling so that they don't show up white Closes #48407 See merge request gitlab-org/gitlab-ce!20163
\| * \| \| \| \| \| \| \| \| \|	Do not style alert links that mimic buttons	Clement Ho	2018-06-25	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-exclude-geo-database-yaml' into 'master'	Robert Speicher	2018-06-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exclude Geo DB Yaml on CE too See merge request gitlab-org/gitlab-ce!20143
\| * \| \| \| \| \| \| \| \| \| \|	Exclude Geo DB Yaml on CE too	Zeger-Jan van de Weg	2018-06-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For Geo, a file is created for configuration of the database. This file shouldn't appear in CE, but if you've setup your GDK with a remote pointing to CE and one to EE, this file might be around when switching branches. This will mark the workspace dirty, which annoys me more than it should. [ci skip]
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '33886-resolve-fsevents-issues' into 'master'	Clement Ho	2018-06-25	4	-133/+122
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "100% CPU for webpack-dev-server running in GDK" Closes #33886 See merge request gitlab-org/gitlab-ce!20113
\| * \| \| \| \| \| \| \| \| \| \|	Resolve "100% CPU for webpack-dev-server running in GDK"	Mike Greiling	2018-06-25	4	-133/+122
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'unify-api-boards_spec.rb' into 'master'	Robert Speicher	2018-06-25	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify spec/requests/api/boards_spec.rb See merge request gitlab-org/gitlab-ce!20158
\| * \| \| \| \| \| \| \| \| \|	Bring changes from EE	Lin Jen-Shin	2018-06-26	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '46202-webide-file-states' into 'master'	Mike Greiling	2018-06-25	4	-20/+24
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE" Closes #46202 See merge request gitlab-org/gitlab-ce!19969
\| * \| \| \| \| \| \| \| \| \| \|	Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE"	Paul Slaughter	2018-06-25	4	-20/+24
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'unify-some-projects-controllers' into 'master'	Robert Speicher	2018-06-25	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify some projects controllers See merge request gitlab-org/gitlab-ce!20157
\| * \| \| \| \| \| \| \| \| \| \|	Bring changes from EE	Lin Jen-Shin	2018-06-26	2	-1/+2
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch '34371-vue-components-tech-debt' into 'master'	Mike Greiling	2018-06-25	4	-82/+88
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves some issue boards components into `.vue` file See merge request gitlab-org/gitlab-ce!20106
\| * \| \| \| \| \| \| \| \| \|	Moves list_dropdown and footer components to a .vue file34371-vue-components-tech-debt	Filipa Lacerda	2018-06-22	4	-82/+88
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jivl-update-gitlab-svg-package' into 'master'	Tim Zallmann	2018-06-25	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bumps gitlab-svg library version See merge request gitlab-org/gitlab-ce!20153
\| * \| \| \| \| \| \| \| \| \| \|	update gitlab-svg versionjivl-update-gitlab-svg-package	Jose	2018-06-25	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-inconsistent-cancel-button' into 'master'	Clement Ho	2018-06-25	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change button text to more specific "Discard draft" Closes #47475 See merge request gitlab-org/gitlab-ce!20140