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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix error when viewing diffs without blobs41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass	Sean McGivern	2018-01-04	3	-8/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Old merge requests can have diffs without corresponding blobs. (This also may be possible for commit diffs in corrupt repositories.) We can't use the `&.` operator on the blobs, because the blob objects are never nil, but `BatchLoader` instances that delegate to `Blob`. We can't use `Object#try`, because `Blob` doesn't inherit from `Object`. `BatchLoader` provides a `__sync` method that returns the delegated object, but using `itself` also works because it's forwarded, and will work for non-`BatchLoader` instances too. So the simplest solution is to just use that with the `&.` operator.
*	Merge branch 'fix-encoding-method-lookup' into 'master'	Grzegorz Bizon	2018-01-03	1	-1/+3
\|\ \| \| \| \| \| \| \| \|	Fix method lookup See merge request gitlab-org/gitlab-ce!16191
\| *	Fix method lookupfix-encoding-method-lookup	Jacob Vosmaer	2018-01-03	1	-1/+3
\|/
*	Merge branch 'tz-ide-file-icons' into 'master'	Sean McGivern	2018-01-03	10	-31/+804
\|\ \| \| \| \| \| \| \| \|	Multi File Editor File icons See merge request gitlab-org/gitlab-ce!16100
\| *	Multi File Editor File icons	Tim Zallmann	2018-01-03	10	-31/+804
\| \|
* \|	Merge branch '41120-performance-bar-auto-scroll' into 'master'	Tim Zallmann	2018-01-03	1	-10/+15
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Resolve "Performance bar prevent the auto-scroll-to-bottom when visiting a job's page" Closes #41120 See merge request gitlab-org/gitlab-ce!16084
\| *	Cache document query41120-performance-bar-auto-scroll	Filipa Lacerda	2018-01-02	1	-2/+3
\| \|
\| *	Merge branch 'master' into 41120-performance-bar-auto-scroll	Filipa Lacerda	2018-01-02	960	-7707/+9056
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (120 commits) Update CHANGELOG.md for 10.3.3 Fix user membership destroy relation Use heredoc so it's more clear Put all menus under menu module Introduce common project settings and just put Introduce Factory::Resource::DeployKey Introduce expand_deploy_keys Introduce Menu::Side Add documents for GitLab utilities Clears visual token on second backspace Update prometheus gem to version that adds inf+ bucket in accordance with Prometheus docs. Add breadcrumbs to User Settings sub-views Rename asset sync related AWS variables Allow logged in user to change his password Fix 404 error after a user edits an issue description and solves the reCAPTCHA Fix links to old commits in merge requests Typos correction on the advise of @smcgivern Documenting that resolved JIRA tickets are not automatically transitioned Forking a project to a namespace with lower visibility. Keep typographic hierarchy in User Settings ...
\| * \|	Use non cached variables to get scroll position because of the performance bar	Filipa Lacerda	2017-12-21	1	-10/+14
\| \| \|
* \| \|	Merge branch 'align-chart-docs' into 'master'	Marin Jankovski	2018-01-03	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align chart docs with readme See merge request gitlab-org/gitlab-ce!16185
\| * \| \|	Align chart docs with readmealign-chart-docs	Joshua Lambert	2018-01-03	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'jprovazn-search-issues' into 'master'	Sean McGivern	2018-01-03	3	-8/+37
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip projects filter on issues search See merge request gitlab-org/gitlab-ce!16117
\| * \| \| \|	Skip projects filter on issues searchjprovazn-search-issues	Jan Provaznik	2018-01-02	3	-8/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When searching for issues, an additional subquery is added which filters only issues in a project. If global context is used (no project is specified) this query filters all projects user has access to. In that case we can skip this filter because filtering only projects user has access to is added anyway. The filter is used only if a custom project context is specified Related to #40540
* \| \| \| \|	Merge branch 'gitaly-conflict-resolver' into 'master'	Grzegorz Bizon	2018-01-03	11	-49/+300
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly conflict resolver Closes gitaly#813 See merge request gitlab-org/gitlab-ce!15755
\| * \| \| \|	Simplify conflict resolution interface and codegitaly-conflict-resolver	Alejandro Rodríguez	2018-01-02	6	-52/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly
\| * \| \| \|	Incorporate ConflictsService.ResolveConflicts Gitaly RPC	Alejandro Rodríguez	2017-12-27	4	-35/+116
\| \| \| \| \|
\| * \| \| \|	Incorporate ConflictsService.ListConflictFiles Gitaly RPC	Alejandro Rodríguez	2017-12-27	8	-23/+177
\| \| \| \| \|
* \| \| \| \|	Merge branch '41357-empty-state-mr' into 'master'	Annabel Dunstone Gray	2018-01-03	2	-9/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Modify the empty state of changes in MR" Closes #41357 See merge request gitlab-org/gitlab-ce!16072
\| * \| \| \| \|	Resolve "Modify the empty state of changes in MR"	Filipa Lacerda	2018-01-03	2	-9/+11
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'fix/remove-unnecessary-sidebar-element-alignment' into 'master'	Annabel Dunstone Gray	2018-01-03	2	-4/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary sidebar element realignment See merge request gitlab-org/gitlab-ce!16159
\| * \| \| \| \|	Remove unnecessary sidebar element realignment	George Tsiolis	2018-01-02	2	-4/+5
\| \|/ / / /
* \| \| \| \|	Merge branch 'jramsay-41287-well-list-overflow' into 'master'	Annabel Dunstone Gray	2018-01-03	1	-0/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add break word wrapping to well-list See merge request gitlab-org/gitlab-ce!16024
\| * \| \| \|	Add break word wrapping to well-listjramsay-41287-well-list-overflow	James Ramsay	2018-01-02	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix/activity-inline-event-line-height' into 'master'	Annabel Dunstone Gray	2018-01-02	2	-1/+11
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix activity inline event line height on mobile Closes #38778 See merge request gitlab-org/gitlab-ce!16121
\| * \| \| \|	Fix activity inline event line height on mobile	George Tsiolis	2017-12-28	2	-1/+11
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Robert Speicher	2018-01-02	1	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-members' into 'master' Backport part of EE's "Remove EE-specific code from `POST /api/v4/projects/:id/members`" See merge request gitlab-org/gitlab-ce!16051
\| * \| \| \| \|	Backport a change made in EEce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-members	Rémy Coutable	2017-12-21	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'rd-fix-reset-password-while-logged-in' into 'master'	Robert Speicher	2018-01-02	2	-0/+21
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow logged in user to change his password Closes gitlab-ee#3482 See merge request gitlab-org/gitlab-ce!16169
\| * \| \| \| \| \|	Allow logged in user to change his passwordrd-fix-reset-password-while-logged-in	Rubén Dávila	2017-12-31	2	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Users were unable to change their password through the "Reset password" link that was sent to their email if they were logged in. This is due to a default controller filter from Devise that requires the user to not be logged in in order to use this link.
* \| \| \| \| \| \|	Merge branch 'docs-gitlab-utilities' into 'master'	Robert Speicher	2018-01-02	2	-0/+93
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documents for GitLab utilities See merge request gitlab-org/gitlab-ce!16161
\| * \| \| \| \| \| \|	Add documents for GitLab utilitiesdocs-gitlab-utilities	Lin Jen-Shin	2018-01-02	2	-0/+93
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Update CHANGELOG.md for 10.3.3	Tiago Botelho	2018-01-02	4	-15/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'fj-40053-error-500-members-list' into 'master'	Douwe Maan	2018-01-02	9	-4/+164
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix user membership destroy relation Closes #40053 See merge request gitlab-org/gitlab-ce!15970
\| * \| \| \| \| \| \| \|	Fix user membership destroy relation	Francisco Javier López	2018-01-02	9	-4/+164
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'qa-add-deploy-key' into 'master'	Grzegorz Bizon	2018-01-02	15	-13/+178
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA: Add a scenario for adding a deploy key See merge request gitlab-org/gitlab-ce!16096
\| * \| \| \| \| \| \| \| \|	Use heredoc so it's more clear	Lin Jen-Shin	2018-01-02	1	-6/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Put all menus under menu module	Lin Jen-Shin	2018-01-02	7	-12/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Introduce common project settings and just put	Lin Jen-Shin	2018-01-02	4	-16/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	everything in the scenario without a before block.
\| * \| \| \| \| \| \| \| \|	Introduce Factory::Resource::DeployKey	Lin Jen-Shin	2018-01-02	3	-16/+35
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Introduce expand_deploy_keys	Lin Jen-Shin	2018-01-02	3	-18/+26
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Introduce Menu::Side	Lin Jen-Shin	2018-01-02	4	-21/+34
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Just add a new class to locate the expand button	Lin Jen-Shin	2017-12-28	2	-6/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update descriptions and names based on feedback	Lin Jen-Shin	2017-12-28	1	-7/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename DeployKey to DeployKeys	Lin Jen-Shin	2017-12-28	3	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	QA: Add a scenario for adding a deploy key	Lin Jen-Shin	2017-12-28	6	-0/+119
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-volume-backup' into 'master'	Douwe Maan	2018-01-02	2	-3/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore "lost+found" folder during backup on a volume Closes #22672 and #17574 See merge request gitlab-org/gitlab-ce!16036
\| * \| \| \| \| \| \| \| \| \|	Add changelog	julien MILLAU	2017-12-20	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Ignore "lost+found" folder during backup on a volume	julien MILLAU	2017-12-20	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'pawel/update-prometheus-gem-to-improve-handling-of-inf-bucket' ↵	Douwe Maan	2018-01-02	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Update prometheus gem to version that publishes +Inf bucket in accordance with Prometheus docs. See merge request gitlab-org/gitlab-ce!16175
\| * \| \| \| \| \| \| \| \| \| \|	Update prometheus gem to version that adds inf+ bucket in accordance with ↵	Pawel Chojnacki	2018-01-02	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prometheus docs.