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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix Rubocop offensemk-fix-wiki-backup	Michael Kozono	2017-07-28	1	-4/+4
\|
*	Add changelog	Michael Kozono	2017-07-28	1	-0/+4
\|
*	Protect backups from stale cache for repo exists	Michael Kozono	2017-07-28	2	-0/+55
\|
*	Merge branch ↵	Clement Ho	2017-07-28	2	-0/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'35044-projects-logo-are-not-centered-vertically-on-projects-page' into 'master' Projects logo are not centered vertically on projects page Closes #35044, #31753, and #35546 See merge request !13124
\| *	Projects logo are not centered vertically on projects page	Florian Lemaitre	2017-07-28	2	-0/+8
\|/
*	Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into ↵	Robert Speicher	2017-07-28	7	-21/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Ensure Gitlab.config.gitlab.host/port and Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs Closes #35599 See merge request !13126
\| *	Fix a spec that was assuming to be on the wrong page35599-fix-uncontrolled-default_url_options-overriding	Rémy Coutable	2017-07-28	1	-6/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵	Rémy Coutable	2017-07-28	6	-15/+13
\| \| \| \| \| \| \| \| \| \| \| \|	Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'rs-fix-master' into 'master'	Robert Speicher	2017-07-28	1	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix spec/features/projects/branches_spec See merge request !13163
\| * \|	Fix spec/features/projects/branches_spec	Robert Speicher	2017-07-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8666
* \| \|	Merge branch 'ux-guide-search-filter-sort' into 'master'	Rémy Coutable	2017-07-28	1	-0/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add copy about search terms to ux guide See merge request !10267
\| * \| \|	Add copy about search terms to ux guide	tauriedavis	2017-07-28	1	-0/+8
\| \| \| \|
* \| \| \|	Merge branch 'docs/jira-article' into 'master'	Marcia Ramos	2017-07-28	1	-8/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to JIRA article in docs Closes #35046 See merge request !13154
\| * \| \| \|	Add link to JIRA article in docsdocs/jira-article	Achilleas Pipinellis	2017-07-28	1	-8/+13
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/ci-only-except' into 'master'	Marcia Ramos	2017-07-28	1	-4/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain all possible values of 'only' and 'except' Closes #34119 See merge request !13138
\| * \| \| \| \|	Explain all possible values of 'only' and 'except'docs/ci-only-except	Achilleas Pipinellis	2017-07-28	1	-4/+17
\| \|/ / / /
* \| \| \| \|	Merge branch 'dm-large-push-performance' into 'master'	Robert Speicher	2017-07-28	4	-16/+29
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load and process at most 100 commits when pushing into default branch Closes #35531 See merge request !13132
\| * \| \| \| \|	Load and process at most 100 commits when pushing into default branch	Douwe Maan	2017-07-28	4	-16/+29
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'	Douwe Maan	2017-07-28	7	-3/+123
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix replying to commit comments on merge requests created from forks Closes #31772 See merge request !13137
\| * \| \| \| \|	Fix replying to commit comments on MRs from forks	Sean McGivern	2017-07-28	7	-3/+123
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A commit comment shows in the MR, but if the MR is from a fork, it will have a different project ID to the MR's target project. In that case, add an note_project_id param so that we can pick the correct project for the note.
* \| \| \| \| \|	Merge branch 'bugfix/fix_v3_project_hooks_build_events' into 'master'	Rémy Coutable	2017-07-28	3	-5/+13
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id See merge request !12673
\| * \| \| \| \|	Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id	Richard Clamp	2017-07-28	3	-5/+13
\|/ / / / /
* \| \| \| \|	Merge branch ↵	Grzegorz Bizon	2017-07-28	3	-3/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inline' into 'master' Resolve "Comment appears in a wrong place after changing diff view to inline" Closes #35695 See merge request !13156
\| * \| \| \| \|	Fix diff commenting results just after changing view35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inline	Sean McGivern	2017-07-28	3	-3/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When you change the diff view (inline / side-by-side), we set a cookie based on that new view. When you add a comment, we choose the style to use in the response based on that cookie. However, when you have just changed diff style, the request cookie will contain the old value, so we should use the view param instead.
* \| \| \| \| \|	Merge branch '26890-sort-branches' into 'master'	Rémy Coutable	2017-07-28	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes the default sort order for branches 'recently updated' rather than by name. Closes #26890 See merge request !8666
\| * \| \| \| \| \|	WIP: This makes the default sort order for branches 'recently updated' ↵26890-sort-branches	Matt Lee	2017-01-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rather than by name.
* \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2017-07-28	3	-1/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix-500-error-when-rendering-avatar-for-deleted-project-creator' into 'master' Fix 500 error when rendering avatar for deleted project creator See merge request !13110
\| * \| \| \| \| \| \|	Fix 500 error when rendering avatar for deleted project creator	Athar Hameed	2017-07-28	3	-1/+24
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'merge-issuable-reopened-into-opened-state' into 'master'	Sean McGivern	2017-07-28	21	-49/+65
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge issuable "reopened" state into "opened" See merge request !12972
\| * \| \| \| \| \| \|	Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-state	Yorick Peterse	2017-07-28	21	-49/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Having two states that essentially mean the same thing is very much like having a boolean "true" and boolean "mostly-true": it's rather silly. This commit merges the "reopened" state into the "opened" state while taking care of system notes still showing messages along the lines of "Alice reopened this issue". A big benefit from having only two states (opened and closed) is that indexing and querying becomes simpler and more performant. For example, to get all the opened queries we no longer have to query both states: SELECT * FROM issues WHERE project_id = 2 AND state IN ('opened', 'reopened'); Instead we can query a single state directly, which can be much faster: SELECT * FROM issues WHERE project_id = 2 AND state = 'opened'; Further, only having two states makes indexing easier as we will only ever filter (and thus scan an index) using a single value. Partial indexes could help but aren't supported on MySQL, complicating the development process and not being helpful for MySQL.
* \| \| \| \| \| \| \|	Merge branch 'techbeacon_ci' into 'master'	Rémy Coutable	2017-07-28	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added article from techbeacon on CI See merge request !10452
\| * \| \| \| \| \| \| \|	added article from techbeacon on CItechbeacon_ci	Chad Malchow	2017-04-04	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'patch-24' into 'master'	Rémy Coutable	2017-07-28	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab_flow.md, Teatro seems to be completely dead, see also… See merge request !13157
\| * \| \| \| \| \| \| \| \|	Update gitlab_flow.md, Teatro seems to be completely dead, see also ↵	bart	2017-07-28	1	-1/+0
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://forum.gitlab.com/t/gitlab-flow-documentation-teatro/7774
* \| \| \| \| \| \| \| \|	Merge branch 'log_webhook_timeout' into 'master'	Rémy Coutable	2017-07-28	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log web hook execution timeout events See merge request !13134
\| * \| \| \| \| \| \| \| \|	Log web hook execution timeout events	Alex Lossent	2017-07-27	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a web hook HTTP request is sent but no response comes within a certain time (10s by default), the hook execution fails and will be retried. This commit makes such timeouts visible in the web hook log, like connection timeouts already are. Also log "no route to host" errors.
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-metrics-haproxy' into 'master'	Rémy Coutable	2017-07-28	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: fix HAProxy name and exporter's link See merge request !13091
\| * \| \| \| \| \| \| \| \| \|	Docs: fix HAProxy name and exporter's link	Dênis Volpato Martins	2017-07-25	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-api-csrf-token-verification' into 'master'	Sean McGivern	2017-07-28	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add log messages to clarify log messages about API CSRF token verification failure Closes #35705 See merge request !13158
\| * \| \| \| \| \| \| \| \| \|	Add log messages to clarify log messages about API CSRF token verification ↵dm-api-csrf-token-verification	Douwe Maan	2017-07-28	1	-0/+8
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	failure
* \| \| \| \| \| \| \| \| \|	Merge branch 'remove-default-access-levels' into 'master'	Rémy Coutable	2017-07-28	2	-15/+71
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make access level for protected tag factories more compatible with EE See merge request !13133
\| * \| \| \| \| \| \| \| \|	Make access level more compatible with EE	Lin Jen-Shin	2017-07-28	2	-15/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So the behaviour would be similar in CE and EE
* \| \| \| \| \| \| \| \| \|	Merge branch '35691-images-in-wiki-display-have-wrong-size' into 'master'	Filipa Lacerda	2017-07-28	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Images in Wiki display have wrong size" Closes #35691 See merge request !13153
\| * \| \| \| \| \| \| \| \| \|	none is not a CSS Value for sizes ;-)	Tim Zallmann	2017-07-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.4.2	James Edwards-Jones	2017-07-28	12	-45/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'help-page-breadcrumb-title-fix' into 'master'	Filipa Lacerda	2017-07-28	2	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the breadcrumb title for help pages Closes #35679 See merge request !13151
\| * \| \| \| \| \| \| \| \| \| \|	Fixed the breadcrumb title for help pageshelp-page-breadcrumb-title-fix	Phil Hughes	2017-07-28	2	-0/+5
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35679
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'ph-inline-js' into 'master'	Tim Zallmann	2017-07-28	23	-112/+135
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed inline JS in shared HAML files See merge request !13073
\| * \| \| \| \| \| \| \| \| \| \|	fixed form action not submitting the correct URLph-inline-js	Phil Hughes	2017-07-28	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into ph-inline-js	Phil Hughes	2017-07-28	971	-1908/+4062
\| \|\ \ \ \ \ \ \ \ \ \ \