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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-cop	Rémy Coutable	2017-06-02	1	-8/+8
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Show current user immediately in issuable filters	Winnie Hellmann	2017-06-02	1	-5/+15
\|
*	Fix replying to a commit discussion displayed in the context of an MR	Douwe Maan	2017-06-01	1	-1/+1
\|
*	Merge branch 'fix_diff_line_comments' into 'master'	Sean McGivern	2017-06-01	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix: A diff comment on a change at last line of a file shows as two comments in discussion Closes #32353 See merge request !11802
\| *	Fix: A diff comment on a change at last line of a file shows as two comments ↵	Valery Sizov	2017-05-31	1	-2/+2
\| \| \| \| \| \| \| \|	in discussion
* \|	Merge branch 'dm-collapsed-blob' into 'master'	Sean McGivern	2017-06-01	2	-13/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Consistent diff and blob size limit names See merge request !11776
\| * \|	Consistent diff and blob size limit names	Douwe Maan	2017-05-29	2	-13/+9
\| \| \|
* \| \|	Merge branch 'rename-builds-controller' into 'master'	Kamil Trzciński	2017-05-31	3	-13/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename BuildsController to JobsController Closes #30699 See merge request !11407
\| * \ \	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-31	4	-10/+37
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (116 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
\| * \ \ \	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-26	7	-25/+18
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (307 commits) Address feedback Add small update for the i18n guide. update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin name all webpack chunks to improve long term cacheability add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin upgrade to latest webpack version Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ Provide default for calculating label text color (!11681) Add failing test for #32728 Bugfix: Always use the default language when generating emails. Remove unecessary commit pattern check Add regexp_for_value helper method Remove shared example and improve sub_group_issuables_spec.rb Remove 'should' from scenario in has_subgroup_title_spec.rb Cartfile git and binary methods cannot take a GitHub repo Fix terminals support for Kubernetes service Add review comments to compare_spec.rb Fix transient error clicking dropdown items in compare_spec.rb Use non-global jQuery reference within raven bundle ...
\| * \ \ \ \	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-18	2	-1/+16
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (31 commits) Remove 'no changes' entries from changelog Check if OLD is set when migrating issue assignees Fix data migration from trigger schedules Replace EFS section in AWS guide Add warning about AWS EFS and performance Consolidate opening text from about.gitlab.com and add active/passive note Fix invalid object reference in ee_compat_check script Fix Ordered Task List Items Add auxiliary viewer for README Update fe_guide testing.md Add auxiliary blob viewer for CHANGELOG Add spec for last commit info when browsing repository files Show last commit for current tree on tree page Use same last commit widget on project homepage and tree view Fix unassigned checkmark Add missing changelog for iPython notebook rendering feature Convert fa-history to svg; tweak alignment Get rid of pluck in app/services/members/authorized_destroy_service.rb Removes duplicate environment variable in documentation Fixed spacing issues in issue sidebar ...
\| * \| \| \| \| \|	Rename BuildsController to JobsController	Lin Jen-Shin	2017-05-17	3	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename other URL generators admin_builds_path -> admin_jobs_path Fix tests and more renaming Fix more tests Also change build_id to job_id in the controller
* \| \| \| \| \| \|	Merge branch 'issue-edit-inline' into 'master'	Filipa Lacerda	2017-05-31	1	-0/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue inline editing Closes #24873 See merge request !11322
\| * \ \ \ \ \ \	Merge branch 'master' into issue-edit-inline	Phil Hughes	2017-05-30	5	-30/+38
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	fixed issuable templates dropdown not showing	Phil Hughes	2017-05-25	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into issue-edit-inline	Phil Hughes	2017-05-25	8	-10/+50
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	fixed bug with can? check when user is not logged in	Phil Hughes	2017-05-24	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Changed all data to come through the JSON script element	Phil Hughes	2017-05-24	1	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Fixed up the template dropdown to correctly work	Phil Hughes	2017-05-16	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Merge branch 'issue-edit-inline' into issue-edit-inline-description-template	Phil Hughes	2017-05-16	1	-0/+4
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Added description template selector	Phil Hughes	2017-05-15	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'user-callout-dismissed-method-rename' into 'master'	Douwe Maan	2017-05-31	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the show_user_callout method See merge request !11689
\| * \| \| \| \| \| \| \| \|	Fixed the show_user_callout methoduser-callout-dismissed-method-rename	Phil Hughes	2017-05-30	1	-1/+1
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '30410-revert-9347-and-10079' into 'master'	Douwe Maan	2017-05-30	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Allow to disable username on checkout url" Closes #30410 and #30174 See merge request !11792
\| * \| \| \| \| \| \| \|	Revert "Merge branch '1937-https-clone-url-username' into 'master' "	Rémy Coutable	2017-05-30	2	-2/+2
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c425f366bfa84efab92b5d5e1d0721f16a2890bc, reversing changes made to 82f6c0f5ac4ed29390ed90592d2c431f3494d93f. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-05-30	1	-0/+8
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled' into 'master' 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Closes #19107 See merge request !11754
\| * \| \| \| \| \| \|	'New issue'/'New merge request' dropdowns should show only projects with ↵19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled	blackst0ne	2017-05-30	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issues/merge requests feature enabled
* \| \| \| \| \| \| \|	Merge branch '30917-wiki-is-not-searchable-with-guest-permissions' into 'master'	Douwe Maan	2017-05-29	1	-8/+25
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Wiki is not searchable with Guest permissions" Closes #30917 See merge request !11613
\| * \| \| \| \| \| \| \|	Create a separate helper to check if we show particular tab on a search page30917-wiki-is-not-searchable-with-guest-permissions	Valery Sizov	2017-05-29	2	-14/+25
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Explicitly test that guest is able to search through the wiki	Valery Sizov	2017-05-29	1	-0/+6
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Strip trailing whitespaces in submodule URLssh-fix-submodules-trailing-spaces	Stan Hu	2017-05-29	1	-0/+1
\| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Users attempting to access repositories that had `.gitmodules` entries with trailing whitespaces would encounter an Error 500. This was due to a change in bf876ec7 that quietly removed the whitespace stripping. Closes #33018
* \| \| \| \| \| \|	Merge branch 'dm-consistent-last-push-event' into 'master'	Robert Speicher	2017-05-26	1	-0/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consistently display last push event widget See merge request !11585
\| * \| \| \| \| \|	Consistently display last push event widget	Douwe Maan	2017-05-25	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dm-diff-cleanup' into 'master'	Robert Speicher	2017-05-25	2	-19/+9
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up diff rendering See merge request !11390
\| * \| \| \| \| \|	Pass fallback_diff_refs to Diff::File instead of using view helpers	Douwe Maan	2017-05-23	1	-20/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Clean up diff rendering	Douwe Maan	2017-05-23	2	-14/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add question mark to Gitlab::Diff::File predicate methods	Douwe Maan	2017-05-23	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'winh-label-textcolor-default' into 'master'	Grzegorz Bizon	2017-05-25	1	-3/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide default for calculating label text color Closes #32728 See merge request !11681
\| * \| \| \| \| \|	Provide default for calculating label text color (!11681)	winh	2017-05-25	1	-3/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	atom links with rss token instead of private token	Alexis Reigel	2017-05-24	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add system note with link to diff comparison when MR discussion becomes outdated	Douwe Maan	2017-05-23	1	-1/+2
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Valery Sizov	2017-05-23	23	-153/+188
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \|	17489-hide-code-from-guests
\| * \| \| \| \|	Fix ProjectCacheWorker for plain READMEs	Toon Claes	2017-05-18	1	-0/+3
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The ProjectCacheWorker refreshes cache periodically, but it runs outside Rails context. So include the ActionView helpers so the `content_tag` method is available.
\| * \| \| \|	Merge branch 'dm-consistent-commit-widget' into 'master'	Dmitriy Zaporozhets	2017-05-17	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use same last commit widget on project homepage and tree view Closes #32245 See merge request !11424
\| \| * \| \| \|	Use same last commit widget on project homepage and tree viewdm-consistent-commit-widget	Douwe Maan	2017-05-17	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'dm-contributing-viewer' into 'master'	Rémy Coutable	2017-05-17	1	-0/+15
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add auxiliary blob viewer for CONTRIBUTING See merge request !11364
\| \| * \| \| \|	Add auxiliary viewer for CONTRIBUTINGdm-contributing-viewer	Douwe Maan	2017-05-16	1	-0/+15
\| \| \|/ / /
\| * \| \| \|	Merge branch 'ability_to_cancel_attaching_file' into 'master'	Douwe Maan	2017-05-16	1	-2/+3
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an ability to cancel attaching file and redesign attaching files UI Closes #15611, #24270, and #28905 See merge request !9431
\| \| * \| \|	Add an ability to cancel attaching file and redesign attaching files UI	blackst0ne	2017-05-16	1	-2/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dm-blob-viewer-concerns' into 'master'	Robert Speicher	2017-05-16	1	-4/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move some blob viewer stuff around without changing behavior See merge request !11358