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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '44361-remove-gitlab-grit' into 'master'	Rémy Coutable	2018-10-17	8	-118/+296
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove gitlab-grit as a transitive dependency of GitLab Closes #44361 See merge request gitlab-org/gitlab-ce!22373
\| *	Remove a dependency on gitlab-gollum-libnick.thomas/gitlab-ce-44361-remove-gitlab-grit	Nick Thomas	2018-10-16	2	-14/+57
\| \| \| \| \| \| \| \| \| \| \| \|	Inlining this code allows us to remove a dependency on gitlab_grit in gitlab-ce. We can't stop maintaining gitlab_grit yet, since gitaly-ruby still depends on this gem, but it moves us a step closer.
\| *	Remove explicit requires from flowdock	Nick Thomas	2018-10-16	2	-5/+0
\| \|
\| *	Remove a dependency on gitlab-gollum-lib	Nick Thomas	2018-10-16	4	-54/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing this dependency also allows us to remove a transitive dependency on gitlab_grit - which is the whole point of this exercise. I don't think we can EOL gitlab_grit until it's removed as a dependency from gitaly-ruby, but this at least gets it out of gitlab-ce.
\| *	Merge flowdock monkeypatch into the inlined gem	Nick Thomas	2018-10-16	3	-101/+23
\| \|
\| *	Rubocop improvements	Nick Thomas	2018-10-16	2	-29/+30
\| \|
\| *	Inline the gitlab-flowdock-git-hooks gem	Nick Thomas	2018-10-16	6	-12/+250
\| \| \| \| \| \| \| \| \| \|	This allows us to avoid one transitive dependency on gitlab-grit. The aim is to remove all transitive dependencies.
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	GitLab Release Tools Bot	2018-10-17	22	-32/+274
\|\ \
\| * \	Merge branch 'extend-create-spec-with-label' into 'master'	Rémy Coutable	2018-10-17	14	-12/+150
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extend Create New Merge Request test to also add a label Closes gitlab-qa#233 See merge request gitlab-org/gitlab-ce!19228
\| \| * \|	Extend Create New Merge Request test to also add a label	Aleksandr Soborov	2018-10-17	14	-12/+150
\| \|/ /
\| * \|	Merge branch 'gt-update-environments-empty-state' into 'master'	Filipa Lacerda	2018-10-17	6	-20/+26
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update environments empty state See merge request gitlab-org/gitlab-ce!22297
\| \| * \|	Update environments empty state	George Tsiolis	2018-10-17	6	-20/+26
\| \| \| \|
\| * \| \|	Merge branch 'add/git-protocol-v2-docs' into 'master'	Evan Read	2018-10-17	2	-0/+98
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Git protocol v2 docs See merge request gitlab-org/gitlab-ce!22227
\| \| * \| \|	Add Git protocol v2 docs	James Lopez	2018-10-17	2	-0/+98
\| \|/ / /
* \| \| \|	Update CHANGELOG.md for 11.3.6	GitLab Release Tools Bot	2018-10-17	1	-0/+4
\|/ / / \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'winh-refactor-job-groups' into 'master'	Phil Hughes	2018-10-17	9	-81/+60
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace job with group in frontend components to be consistent with backend See merge request gitlab-org/gitlab-ce!22387
\| * \| \|	Replace job with group in frontend components to be consistent with backend	Winnie Hellmann	2018-10-17	9	-81/+60
\|/ / /
* \| \|	Merge branch 'issue_49936' into 'master'	Marcia Ramos	2018-10-17	9	-54/+89
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow JIRA to login using email and API token Closes #49936 See merge request gitlab-org/gitlab-ce!21726
\| * \| \|	Allow JIRA to login using email and API token	Felipe Artur	2018-10-17	9	-54/+89
\|/ / /
* \| \|	Merge branch 'sh-sh-add-nfs-details-docs' into 'master'	Marcia Ramos	2018-10-17	1	-1/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation on using NFS v4.1 and disabling server delegations See merge request gitlab-org/gitlab-ce!22379
\| * \| \|	Add documentation on using NFS v4.1 and disabling server delegations	Stan Hu	2018-10-16	1	-1/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For more info, see: * https://gitlab.com/gitlab-org/gitaly/issues/1339 * https://gitlab.com/gitlab-org/gitlab-ce/issues/52017
* \| \| \|	Merge branch '50904-job-log' into 'master'	Phil Hughes	2018-10-17	34	-1400/+1448
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Integrate new vue+vuex code base with new API and remove old haml code" Closes #50904 See merge request gitlab-org/gitlab-ce!22116
\| * \| \| \|	Resolve "Integrate new vue+vuex code base with new API and remove old haml code"	Filipa Lacerda	2018-10-17	34	-1400/+1448
\|/ / / /
* \| \| \|	Merge branch '37727-fix-file-delete-redirect' into 'master'	Rémy Coutable	2018-10-17	4	-5/+93
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "In web editor, when delete a file, should navigate to enclosing directory" Closes #37727 See merge request gitlab-org/gitlab-ce!21465
\| * \| \|	Resolve "In web editor, when delete a file, should navigate to enclosing ↵	George Thomas	2018-10-17	4	-5/+93
\|/ / / \| \| \| \| \| \| \| \| \|	directory"
* \| \|	Merge branch '51712-new-line-before-expect' into 'master'	Mike Greiling	2018-10-17	220	-108/+1149
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	3. enable jasmine/new-line-before-expect See merge request gitlab-org/gitlab-ce!22234
\| * \| \|	enable jasmine/new-line-before-expect	Johann Hubert Sonntagbauer	2018-10-17	220	-108/+1149
\|/ / /
* \| \|	Merge branch 'prettify-all-the-things-8' into 'master'	Fatih Acet	2018-10-16	50	-1051/+1330
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prettify all the things (part 8) See merge request gitlab-org/gitlab-ce!22258
\| * \| \|	Prettify additional modules (I through Z)	Mike Greiling	2018-10-16	50	-1051/+1330
\| \| \| \|
* \| \| \|	Merge branch 'prettify-all-the-things-1' into 'master'	Fatih Acet	2018-10-16	76	-1029/+1138
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prettify all the things (part 1) See merge request gitlab-org/gitlab-ce!22248
\| * \| \| \|	Prettify environments feature_highlight and filtered_search modules	Mike Greiling	2018-10-16	22	-405/+459
\| \| \| \| \|
\| * \| \| \|	Prettify diff_notes diffs and droplab modules	Mike Greiling	2018-10-16	18	-136/+172
\| \| \| \| \|
\| * \| \| \|	Prettify blob behaviors and cycle_analytics modules	Mike Greiling	2018-10-16	36	-488/+507
\| \|/ / /
* \| \| \|	Merge branch '49740-share-frontend-configs-between-repos' into 'master'	Clement Ho	2018-10-16	3	-46/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Share frontend configs between repos" Closes #49740 See merge request gitlab-org/gitlab-ce!22405
\| * \| \| \|	Use @gitlab/eslint-config as base in eslintrc	Mike Greiling	2018-10-16	3	-46/+19
\| \| \| \| \|
* \| \| \| \|	Merge branch '51712-no-promise-without-done-fail' into 'master'	Mike Greiling	2018-10-16	7	-19/+17
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	2. enable jasmine/no-promise-without-done-fail See merge request gitlab-org/gitlab-ce!22231
\| * \| \| \|	enable jasmine/no-promise-without-done-fail	Johann Hubert Sonntagbauer	2018-10-16	7	-19/+17
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-review-link-docs' into 'master'	Douwe Maan	2018-10-16	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "ready for review" link See merge request gitlab-org/gitlab-ce!22393
\| * \| \| \| \|	Fix "ready for review" link	Jan Provaznik	2018-10-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove assignee_id=0 condition from search filters, we agreed that just presence of "ready of review" label is sufficient for filtering MRs, no need to unassign yourself.
* \| \| \| \| \|	Merge branch 'sh-fix-commit-signatures-error' into 'master'	Douwe Maan	2018-10-16	3	-2/+24
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commit signature error when project is disabled Closes #50903 See merge request gitlab-org/gitlab-ce!22344
\| * \| \| \| \| \|	Fix commit signature error when project is disabled	Stan Hu	2018-10-15	3	-2/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a project is disabled, visiting the home page would show, "An error occurred while loading commit signatures". This change checks that the user has permission to view the project to avoid unnecessary GPG signature lookups. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50903
* \| \| \| \| \| \|	Merge branch '52650-webhook-image-urls-rewritten-incorrectly-in-issues' into ↵	Douwe Maan	2018-10-16	6	-55/+115
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Webhook Image URLs Rewritten Incorrectly in Issues" Closes #52650 See merge request gitlab-org/gitlab-ce!22361
\| * \| \| \| \| \|	Web hook -> webhook	Sean McGivern	2018-10-16	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix image webhook rewriting for uploads	Sean McGivern	2018-10-16	6	-53/+113
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This rewrote URLs to be absolute URLs. However, for uploads (the most common case), we actually need them to point to not just the GitLab instance, but the project they're from. Thankfully, we can normally get that information from the object we're building the hook for.
* \| \| \| \| \| \|	Merge branch 'prettify-all-the-things-6' into 'master'	Fatih Acet	2018-10-16	49	-1443/+1458
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prettify all the things (part 6) See merge request gitlab-org/gitlab-ce!22256
\| * \| \| \| \| \| \|	Prettify vue_shared modules	Mike Greiling	2018-10-10	28	-925/+914
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Prettify vue_merge_request_widget modules	Mike Greiling	2018-10-10	22	-520/+550
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '52147-loading-state' into 'master'	Mike Greiling	2018-10-16	4	-11/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes styling issues in test reports Closes #51386 and #52147 See merge request gitlab-org/gitlab-ce!22204
\| * \| \| \| \| \| \| \|	Adds a `js-` class to allow for specs	Filipa Lacerda	2018-10-11	2	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rspec was using a CSS class to check if the content was being rendered. Since the CSS has changed, the specs failed This commit replaces the CSS class with a `js-` prepended one to guarantee changing CSS won't break a pipeline
\| * \| \| \| \| \| \| \|	Fixes styling issues in test reports	Filipa Lacerda	2018-10-11	3	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the Merge Request widget, the reports for tests had an extra border. The loading icon in the mr widget used in all report sections had an extra margin causing text to be misaligned. This commit fixes both issues Closes #52147