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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch ↵	Douwe Maan	2017-12-18	1	-0/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40871-todo-notification-count-shows-notification-without-having-a-todo' into 'master' Resolve "Todo notification count shows notification without having a todo" Closes #40871 See merge request gitlab-org/gitlab-ce!15807
\| *	Reset todo counters when the target is deleted40871-todo-notification-count-shows-notification-without-having-a-todo	Sean McGivern	2017-12-18	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	When the target is deleted, todos are destroyed, but we did not reset the todo cache for users with todos on the deleted target. This would only update after the next time the todo cache was updated for that user.
* \|	Merge branch '39298-list-of-avatars-2' into 'master'	Rémy Coutable	2017-12-18	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	List of avatars should never show +1 Closes #39298 See merge request gitlab-org/gitlab-ce!15972
\| * \|	List of avatars should never show +1	Jacopo	2017-12-18	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The list of avatars should never show +1. If you have +1, that means you can use that space to show that person's avatar, for that reason should always start with +2.
* \| \|	Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'	Kamil Trzciński	2017-12-18	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add button to run scheduled pipeline immediately Closes #38741 See merge request gitlab-org/gitlab-ce!15700
\| * \| \|	Add button to run scheduled pipeline immediately	Stan Hu	2017-12-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #38741
* \| \| \|	Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'	Sean McGivern	2017-12-18	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests See merge request gitlab-org/gitlab-ce!15847
\| * \| \| \|	Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributes	Oswaldo Ferreira	2017-12-15	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	requests
* \| \| \| \|	Merge branch 'winh-translate-contributors-page-dates' into 'master'	Filipa Lacerda	2017-12-18	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translate contributors page dates Closes #39283 and #38592 See merge request gitlab-org/gitlab-ce!15846
\| * \| \| \| \|	Add createDateTimeFormat to format dates based on locale	Winnie Hellmann	2017-12-18	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Fixes 40842 - Adds extra cookies to JIRA service requests	Stanislaw Wozniak	2017-12-18	1	-0/+6
\|/ / / / /
* \| \| \| \|	Fix job count in pipeline success mail	Christiaan Van den Poel	2017-12-18	1	-0/+5
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge branch '38019-hide-runner-token' into 'master'	Clement Ho	2017-12-15	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide runner token in CI/CD settings page Closes #38019 See merge request gitlab-org/gitlab-ce!15918
\| * \| \| \|	Hide runner token in CI/CD settings page38019-hide-runner-token	Eric Eastwood	2017-12-15	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38019
* \| \| \| \|	Update CHANGELOG.md for 10.2.5	Michael Kozono	2017-12-15	11	-56/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	fix issue #39843 Incorrect guidance stating blocked users will be removed ↵	Cesar Apodaca	2017-12-15	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from groups and projects as members
* \| \| \| \|	Merge branch '38239-update-toggle-design' into 'master'	Filipa Lacerda	2017-12-15	1	-0/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update feature toggle design to use icons and make it i18n friendly Closes #38239 See merge request gitlab-org/gitlab-ce!15904
\| * \| \| \|	Add changelog entry38239-update-toggle-design	Kushal Pandya	2017-12-15	1	-0/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-ldap-email-readonly' into 'master'	Sean McGivern	2017-12-15	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure user email is read only when synced with LDAP Closes #41033 See merge request gitlab-org/gitlab-ce!15915
\| * \| \| \| \|	Make sure user email is read only when synced with LDAP	Douwe Maan	2017-12-15	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Fix UX issues in system info page	Gilbert Roulot	2017-12-15	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '38541-cancel-alignment' into 'master'	Filipa Lacerda	2017-12-15	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix button alignment on MWPS component Closes #38541 See merge request gitlab-org/gitlab-ce!15835
\| * \| \| \| \| \|	fix button alignment on MWPS component38541-cancel-alignment	Simon Knox	2017-12-11	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '41016-import-gitlab-shell-projects' into 'master'	Douwe Maan	2017-12-15	1	-0/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import gitlab-shell gitlab_projects.rb as at v5.10.2 Closes #41016 See merge request gitlab-org/gitlab-ce!15853
\| * \| \| \| \| \| \|	Import gitlab_projects.rb from gitlab-shell	Nick Thomas	2017-12-14	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By importing this Ruby code into gitlab-rails (and gitaly-ruby), we avoid 200ms of startup time for each gitlab_projects subprocess we are eliminating. By not having a gitlab_projects subprocess between gitlab-rails / sidekiq and any git subprocesses (e.g. for fork_project, fetch_remote, etc, calls), we can also manage these git processes more cleanly, and avoid sending SIGKILL to them
* \| \| \| \| \| \| \|	Merge branch 'lfs-badge' into 'master'	Douwe Maan	2017-12-15	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added LFS badge to indicate LFS tracked files Closes #15567 See merge request gitlab-org/gitlab-ce!15845
\| * \| \| \| \| \| \|	Added LFS badge to indicate LFS tracked files	Phil Hughes	2017-12-11	1	-0/+5
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15567
* \| \| \| \| \| \|	sorting for tags api	haseeb	2017-12-14	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'tc-correct-email-in-reply-to' into 'master'	Sean McGivern	2017-12-14	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make mail notifications of discussion notes In-Reply-To of each other Closes #36054 See merge request gitlab-org/gitlab-ce!14289
\| * \| \| \| \| \| \|	Make mail notifications of discussion notes In-Reply-To of each other	Toon Claes	2017-12-13	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a note is part of a discussion, the email sent out should be `In-Reply-To` the previous note in that discussion. Closes gitlab-org/gitlab-ce#36054
* \| \| \| \| \| \| \|	Merge branch '25317-prioritize-author-date-over-commit' into 'master'	Sean McGivern	2017-12-14	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use author info on commits list page rather than most recent commit date Closes #25317 See merge request gitlab-org/gitlab-ce!15868
\| * \| \| \| \| \| \| \|	Use author info on commits list page rather than most recent commit date	Annabel Dunstone Gray	2017-12-11	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue-description-field-typo' into 'master'	Fatih Acet	2017-12-13	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected typo in quick action data attribute Closes #41035 See merge request gitlab-org/gitlab-ce!15872
\| * \| \| \| \| \| \| \|	Merge branch 'master' into issue-description-field-typo	Marcus Amargi	2017-12-12	9	-0/+46
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	corrected typo in quick action data attribute	Marcus Amargi	2017-12-11	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '13695-order-contributors-in-api' into 'master'	Rémy Coutable	2017-12-13	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds ordering to projects contributors in API Closes #13695 See merge request gitlab-org/gitlab-ce!15469
\| * \| \| \| \| \| \| \| \|	Adds ordering to projects contributors in API	Jacopo	2017-12-13	1	-0/+5
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows ordering in GET api/v4/projects/:project_id/repository/contributors through `order_by` and `sort` params. The available `order_by` options are: name\|email\|commits. The available `sort` options are: asc\|desc.
* \| \| \| \| \| \| \| \|	Merge branch '33926-update-issuable-icons' into 'master'	Annabel Dunstone Gray	2017-12-13	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update issuable status icons Closes #33926 See merge request gitlab-org/gitlab-ce!15898
\| * \| \| \| \| \| \| \| \|	Update issuable status icons33926-update-issuable-icons	Eric Eastwood	2017-12-13	1	-0/+5
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926 Changed file icons already addressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367
* \| \| \| \| \| \| \| \|	Merge branch 'add-tcp-check-rake-task' into 'master'	Rémy Coutable	2017-12-13	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a gitlab:tcp_check rake task See merge request gitlab-org/gitlab-ce!15759
\| * \| \| \| \| \| \| \| \|	Add a gitlab:tcp_check rake task	Nick Thomas	2017-12-13	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to avoid relying on telnet / netcat being installed
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-create-mr-from-issue-with-template' into 'master'	Rémy Coutable	2017-12-13	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Execute quick actions when creating MR from issue Closes gitlab-ee#4277 See merge request gitlab-org/gitlab-ce!15810
\| * \| \| \| \| \| \| \| \| \|	Execute quick actions when creating MR from issuefix-create-mr-from-issue-with-template	Sean McGivern	2017-12-13	1	-0/+5
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In CE, this does nothing - the `MergeRequests::BuildService` will, at the time of writing, never return a description for this case. In EE, a project can have a default MR template, which will be returned by the service. Previously we were only using the description passed in the params, ignoring any already set on the object. Now we fall back to the one set on the object if there was none in the params, allowing quick actions to be executed from default MR templates when creating an MR from an issue.
* \| \| \| \| \| \| \| \| \|	Use relative URL for projects to avoid storing domains	Kushal Pandya	2017-12-13	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' ↵	Tim Zallmann	2017-12-13	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Prometheus loading screen no longer seems to appear" Closes #40285 See merge request gitlab-org/gitlab-ce!15889
\| * \| \| \| \| \| \| \| \|	add CHANGELOG.md entry for !1588940285-prometheus-loading-screen-no-longer-seems-to-appear	Mike Greiling	2017-12-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'remove-tabindexes-from-tag-form' into 'master'	Annabel Dunstone Gray	2017-12-12	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed tab indexes from tag form See merge request gitlab-org/gitlab-ce!15886
\| * \| \| \| \| \| \| \| \|	removed tab indexes from tag form	Marcus Amargi	2017-12-12	1	-0/+5
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2017-12-12	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master' Refactor member view by using presenter Closes #28004 See merge request gitlab-org/gitlab-ce!15715
\| * \| \| \| \| \| \| \| \|	Refactor member view by using presenter	TM Lee	2017-12-11	1	-0/+4
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Create MemberPresenter alongside with GroupMemberPresenter and ProjectMemberPresenter - Make Member model Presentable - Move action_member_permission from MembersHelper into the MemberPresenter - Added rspec using double, separate specs for GroupMemberPresenter and ProjectMemberPresenter Fixes #28004. Signed-off-by: Rémy Coutable <remy@rymai.me>