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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Refactor the browser performance testing docsdocs/performance-testing	Achilleas Pipinellis	2018-03-29	1	-20/+73
\| \| \| \| \|	From my experience in setting this up https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/231/diffs
*	Merge branch '44508-fix-fork-namespace-images' into 'master'	Rémy Coutable	2018-03-28	2	-1/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "When forking any project, the images (avatar) of the groups (and subgroups) are not loaded." Closes #44508 See merge request gitlab-org/gitlab-ce!18048
\| *	Fix bug rendering group icons when forking	Mark Fletcher	2018-03-28	2	-1/+6
\| \| \| \| \| \| \| \|	- NamespacesHelper#namespace_icon should return a URL instead of an image_tag for groups
* \|	Merge branch ↵	Douwe Maan	2018-03-28	5	-12/+49
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44392-resolve-projects-creation-silently-failing-on-after-create-error' into 'master' Resolve "For new created projects permissions are not inherited from group level" Closes #44692 See merge request gitlab-org/gitlab-ce!18013
\| * \|	When a Service templates are invalid newly created projects will have them ↵	Tiago Botelho	2018-03-28	4	-8/+27
\| \| \| \| \| \| \| \| \| \| \| \|	inactive
\| * \|	Project creation does not fail silently on DB related changes	Tiago Botelho	2018-03-27	3	-8/+26
\| \| \|
* \| \|	Merge branch 'docs-fe-js' into 'master'	Tim Zallmann	2018-03-28	1	-1/+193
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add JavaScript style guide See merge request gitlab-org/gitlab-ce!17617
\| * \| \|	Add JavaScript style guide	Clement Ho	2018-03-28	1	-1/+193
\|/ / /
* \| \|	Merge branch 'docs-extract-ee-api' into 'master'	Rémy Coutable	2018-03-28	1	-0/+249
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document a few strategies to extract EE APIs See merge request gitlab-org/gitlab-ce!17573
\| * \| \|	Clarify what rules we should follow for namingdocs-extract-ee-api	Lin Jen-Shin	2018-03-26	1	-2/+3
\| \| \| \|
\| * \| \|	Copyedit doc/development/ee_features.md	Robert Speicher	2018-03-23	1	-36/+35
\| \| \| \|
\| * \| \|	Document a few strategies to extract EE APIs	Lin Jen-Shin	2018-03-07	1	-0/+249
\| \| \| \|
* \| \| \|	Merge branch 'expose-commits-mr-api' into 'master'	Rémy Coutable	2018-03-28	4	-0/+116
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow merge requests related to a commit to be found via API See merge request gitlab-org/gitlab-ce!18004
\| * \| \| \|	Allow merge requests related to a commit to be found via API	Mark Fletcher	2018-03-26	4	-0/+116
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Original work for the web interface here: - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13713
* \| \| \|	Merge branch '44649-reference-parsing-conflicting-with-auto-linking' into ↵	Douwe Maan	2018-03-28	3	-2/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Reference parsing conflicting with auto-linking" Closes #44649 See merge request gitlab-org/gitlab-ce!18045
\| * \| \| \|	Fix auto-linking with escaped HTML entities	Sean McGivern	2018-03-28	3	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We displayed the correct text as the link text (without double-encoding), but didn't do the same for the actual link target, so any link containing an ampersand would break when auto-linked.
* \| \| \| \|	Merge branch 'fix-workhorse-test' into 'master'	Sean McGivern	2018-03-28	5	-10/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make all workhorse gitaly calls opt-out, take 2 See merge request gitlab-org/gitlab-ce!18043
\| * \| \| \| \|	Make all workhorse gitaly calls opt-out, take 2	Jacob Vosmaer	2018-03-28	5	-10/+18
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'zj-remote-repo-exists' into 'master'	Sean McGivern	2018-03-28	9	-7/+45
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test if remote repository exists before cloning Closes #43929 and gitaly#1084 See merge request gitlab-org/gitlab-ce!18017
\| * \| \| \| \| \|	Test if remote repository exists before cloning	Zeger-Jan van de Weg	2018-03-27	9	-7/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a repository does not exist on a remote, Gitaly won't be able to clone it. This is correct behaviour, but from the clients perspective a change in behaviour. This change implements the client side changes that allows Gitaly to execute a `git ls-remote <remote-url> HEAD`. This way the client has no need to shell out to Git. In the situation where multiple Gitalies are available, one is chosen at random. This commit closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43929, while its also a part of https://gitlab.com/gitlab-org/gitaly/issues/1084
* \| \| \| \| \| \|	Merge branch 'bvl-no-permanent-redirect' into 'master'	Douwe Maan	2018-03-28	19	-398/+236
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't create permanent redirect when renaming a namespace See merge request gitlab-org/gitlab-ce!17521
\| * \| \| \| \| \| \|	Add the RedirectRoute#path index setup_postgresql	Bob Van Landuyt	2018-03-28	2	-9/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	New migration helper for finding custom indexes	Bob Van Landuyt	2018-03-28	2	-4/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will use the same query as `\di` to find an index on postgresql.
\| * \| \| \| \| \| \|	Add index on lower path to redirect routes	Bob Van Landuyt	2018-03-28	1	-0/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will speed up the LIKE query in RedirectRoute.matching_path_and_descendants
\| * \| \| \| \| \| \|	Don't run ReworkRedirectRoutesIndexes during setup	Bob Van Landuyt	2018-03-28	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the `permanent` column is not there anymore, we don't need to create these indexes.
\| * \| \| \| \| \| \|	Update documentation for redirects	Bob Van Landuyt	2018-03-28	1	-10/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove permanent redirects	Bob Van Landuyt	2018-03-28	12	-381/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes permanent redirects, this means that redirects will only be possible as long as the old route isn't taken by a new project/group.
\| * \| \| \| \| \| \|	Remove `permanent` from `redirect_routes`	Bob Van Landuyt	2018-03-28	2	-1/+37
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes the column that was added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15670 since we will no longer be allowing _permanent_ redirects
* \| \| \| \| \| \|	Merge branch '33803-drop-json-support-in-project-milestone' into 'master'	Rémy Coutable	2018-03-28	3	-2/+20
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Drop JSON support from Projects::MilestonesController#show Closes #33803 See merge request gitlab-org/gitlab-ce!17977
\| * \| \| \| \| \|	Drop JSON response in Project Milestone along with avoiding error	Takuya Noguchi	2018-03-25	3	-2/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '43794-fix-domain-verification-validation-errors' into 'master'	Grzegorz Bizon	2018-03-28	3	-3/+31
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "ActiveRecord::RecordInvalid: Validation failed: Certificate misses intermediates" Closes #43794 See merge request gitlab-org/gitlab-ce!17992
\| * \| \| \| \| \| \|	Allow pages domain verification to run on invalid domains	Nick Thomas	2018-03-26	3	-3/+31
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ignore-jsconfig' into 'master'	Phil Hughes	2018-03-28	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitignore for vscode config file See merge request gitlab-org/gitlab-ce!18037
\| * \| \| \| \| \| \|	gitignore for vscode config file	Simon Knox	2018-03-28	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'"	Sean McGivern	2018-03-28	3	-13/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !18002
* \| \| \| \| \| \| \|	Merge branch 'refactor/move-time-tracking-comparison-pane-vue-component' ↵	Filipa Lacerda	2018-03-28	3	-38/+47
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Move TimeTrackingComparisonPane vue component See merge request gitlab-org/gitlab-ce!17931
\| * \| \| \| \| \| \| \|	Move TimeTrackingComparisonPane vue component	George Tsiolis	2018-03-22	3	-38/+47
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'tc-sh-fix-issue-5461-ce' into 'master'	Rémy Coutable	2018-03-28	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean the test path after each spec run See merge request gitlab-org/gitlab-ce!18035
\| * \| \| \| \| \| \| \| \|	Clean the test path after each spec run	Stan Hu	2018-03-28	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FactoryBot's build_stubbed ignores the current database sequence of the projects table and starts at ID 1000. If more than 1000 projects are created during a test run, leftover repositories can cause spec failures. For example, a spec that expects an empty repository may fail since there may be existing content. Closes #5461
* \| \| \| \| \| \| \| \| \|	Merge branch 'dz-improve-app-settings-2' into 'master'	Filipa Lacerda	2018-03-28	7	-138/+207
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redesign application settings to match project settings (part 2) See merge request gitlab-org/gitlab-ce!18019
\| * \| \| \| \| \| \| \| \| \|	Fix admin settings specdz-improve-app-settings-2	Dmitriy Zaporozhets	2018-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Move ci/cd, influx and prometheus app settings to expandable sections	Dmitriy Zaporozhets	2018-03-27	7	-138/+207
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'more-legacy' into 'master'	Sean McGivern	2018-03-28	10	-41/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove some easy cases of 'path_to_repo' use See merge request gitlab-org/gitlab-ce!17997
\| * \| \| \| \| \| \| \| \| \| \|	Remove some easy cases of 'path_to_repo' use	Jacob Vosmaer (GitLab)	2018-03-28	10	-41/+16
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Filipa Lacerda	2018-03-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43952-use-a-better-link-for-documentation-on-existing-cluster-creation-form' into 'master' Resolve "Use a better link for documentation on existing cluster creation form" Closes #43952 See merge request gitlab-org/gitlab-ce!18025
\| * \| \| \| \| \| \| \| \| \| \|	Add anchor43952-use-a-better-link-for-documentation-on-existing-cluster-creation-form	Fabio Busatto	2018-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '27210-add-cancel-btn-to-new-page-domain' into 'master'	Filipa Lacerda	2018-03-28	2	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Missing cancel button when creating new domain for pages" Closes #27210 See merge request gitlab-org/gitlab-ce!18026
\| * \| \| \| \| \| \| \| \| \| \| \|	Adds cancel btn to new pages domain page	Jacopo	2018-03-27	2	-0/+7
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ide-wordwrap' into 'master'	Tim Zallmann	2018-03-28	2	-24/+17
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable word wrap in IDE Closes #44303 See merge request gitlab-org/gitlab-ce!17994
\| * \| \| \| \| \| \| \| \| \| \| \|	Enable word wrap in IDE	Phil Hughes	2018-03-27	2	-24/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44303