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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make pagination optional for issuablesjprovazn-pagination	Jan Provaznik	2018-01-29	2	-5/+38
\| \| \| \| \| \| \| \| \| \|	On epics roadmap page we list all epics in the given time frame without pagination (at least for the first iteration), in this case it would be nice to use the existing issuables index logic except pagination (see MR gitlab-ee!4281). For this reason this patch allows to easily disable pagination. Related gitlab-ee!4281
*	Merge branch ↵	Achilleas Pipinellis	2018-01-29	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42521-docs-update-usage-of-force-option-when-running-the-restore-raketask' into 'master' Resolve "Docs update usage of force option when running the restore raketask" Closes #42521 See merge request gitlab-org/gitlab-ce!16759
\| *	Updating docs for usage of force=yes when performing a restore.42521-docs-update-usage-of-force-option-when-running-the-restore-raketask	astrachan	2018-01-29	1	-1/+1
\| \|
* \|	Merge branch 'qa/mk-fix-unable-to-click-new-project-in-dropdown' into 'master'	Rémy Coutable	2018-01-29	1	-2/+12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[CE backport] Fix intermittently failed click in dropdown in QA See merge request gitlab-org/gitlab-ce!16738
\| * \|	Fix intermittently failed click in dropdownqa/mk-fix-unable-to-click-new-project-in-dropdown	Michael Kozono	2018-01-26	3	-11/+25
\| \| \| \| \| \| \| \| \| \| \| \|	I haven’t seen `go_to_new_subgroup` fail in the same way, but it seems best to modify it also.
* \| \|	Merge branch 'qa/mk-fix-intermittent-clone-failure' into 'master'	Rémy Coutable	2018-01-29	1	-6/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE backport] Fix intermittent clone failure in QA See merge request gitlab-org/gitlab-ce!16739
\| * \| \|	Fix intermittent clone over SSH failureqa/mk-fix-intermittent-clone-failure	Michael Kozono	2018-01-26	3	-15/+22
\| \|/ / \| \| \| \| \| \| \| \| \|	We always clone over HTTP, so if the QA spec attempts to clone over SSH, we know it gathered the wrong repo URI.
* \| \|	Merge branch 'nogravatar-fix-default-avatar' into 'master'	Fatih Acet	2018-01-29	5	-8/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix avatar icon missing when Gravatar is disabled Closes #34733 and #38715 See merge request gitlab-org/gitlab-ce!16681
\| * \| \|	Add changelog entry for !16681	Felix Geyer	2018-01-28	1	-0/+5
\| \| \| \|
\| * \| \|	Fall back to default_avatar_url in issue assigment.	Felix Geyer	2018-01-28	2	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the avatar in issue assignments when the user hasn't got an avatar and Gravatar is disabled. Closes #34733
\| * \| \|	Make default_avatar return a full path.	Felix Geyer	2018-01-28	2	-3/+3
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Callers expect a URL. This fixes the avatars in commit lists when a user has no avatar and Gravatar is disabled. Closes #38715
* \| \|	Merge branch 'qa_78_create_merge_request' into 'master'	Grzegorz Bizon	2018-01-29	12	-9/+137
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create merge request factory See merge request gitlab-org/gitlab-ce!15964
\| * \| \|	Create merge request specqa_78_create_merge_request	Felipe Artur	2018-01-26	12	-9/+137
\| \| \| \|
* \| \| \|	Merge branch 'qa/mk-fix-element-is-not-clickable-at-point' into 'master'	Grzegorz Bizon	2018-01-29	3	-10/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE backport] Fix intermittent QA error -- Expand button not bound to JS See merge request gitlab-org/gitlab-ce!16737
\| * \| \| \|	Fix intermittent click errorqa/mk-fix-element-is-not-clickable-at-point	Michael Kozono	2018-01-26	3	-10/+19
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'qa/mk-fix-new-project-namespace' into 'master'	Grzegorz Bizon	2018-01-29	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE backport] Fix QA new project creation click on incorrect namespace See merge request gitlab-org/gitlab-ce!16736
\| * \| \| \|	Fix click on incorrect namespaceqa/mk-fix-new-project-namespace	Michael Kozono	2018-01-26	1	-2/+2
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	in certain conditions. And `first` was causing it to succeed even though the criteria were ambiguous.
* \| \| \|	Merge branch 'axios-post-awards-handler' into 'master'	Fatih Acet	2018-01-29	1	-4/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace $.post in awards handler with axios See merge request gitlab-org/gitlab-ce!16685
\| * \| \| \|	Replace $.post in awards handler with axios	Clement Ho	2018-01-29	1	-4/+8
\|/ / / /
* \| \| \|	Merge branch '42255-disable-mr-checkout-button-when-source-branch-deleted' ↵	Fatih Acet	2018-01-29	3	-11/+33
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "MR "Check out branch" button should be disabled when the source branch is deleted" Closes #42255 See merge request gitlab-org/gitlab-ce!16631
\| * \| \| \|	Disable MR check out button when source branch is deleted	Jacopo	2018-01-29	3	-11/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After source branch deletion the Merge request `Check out branch` button is disabled.
* \| \| \| \|	Merge branch 'improve_nginx_confs' into 'master'	Rémy Coutable	2018-01-29	2	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve Nginx configuration files See merge request gitlab-org/gitlab-ce!16605
\| * \| \| \| \|	Add omnibus remarks	Melroy van den Berg	2018-01-26	2	-0/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-mute-notifications-seeder' into 'master'	Rémy Coutable	2018-01-29	1	-0/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mute notifications in the seeder to speed GDK development See merge request gitlab-org/gitlab-ce!16747
\| * \| \| \| \| \|	Mute notifications in the seeder to speed GDK developmentsh-mute-notifications-seeder	Stan Hu	2018-01-26	1	-0/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-merged-at-check-for-reverted-mrs' into 'master'	Nick Thomas	2018-01-29	2	-16/+26
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR revert check when no merged_at is present See merge request gitlab-org/gitlab-ce!16760
\| * \| \| \| \| \|	Fix MR revert check when no merged_at is present	Sean McGivern	2018-01-29	2	-16/+26
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'followup-to-40744-idempotent-ids' into 'master'	Nick Thomas	2018-01-29	1	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix JS equality rules in some specs See merge request gitlab-org/gitlab-ce!16734
\| * \| \| \| \| \|	Fix JS equality rules in some specs	Nick Thomas	2018-01-26	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ph-more-axios' into 'master'	Filipa Lacerda	2018-01-29	7	-189/+150
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More conversions of $.ajax to axios See merge request gitlab-org/gitlab-ce!16731
\| * \| \| \| \| \| \|	normalize headers correctly	Phil Hughes	2018-01-29	3	-13/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n flash message
\| * \| \| \| \| \| \|	fixed dashboard projects not being filterable	Phil Hughes	2018-01-29	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Converted filterable_list to axios	Phil Hughes	2018-01-29	2	-25/+20
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Converted due_date_select to axios	Phil Hughes	2018-01-29	1	-27/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Converted dropzone_input to axios	Phil Hughes	2018-01-29	1	-18/+15
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Converted create_merge_request_dropdown to axios	Phil Hughes	2018-01-29	1	-80/+67
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	converted compare_autocomplete to axios	Phil Hughes	2018-01-29	1	-7/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Convered compare.js to axios	Phil Hughes	2018-01-29	1	-26/+21
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'gitlab-git-spawn-env' into 'master'	Rémy Coutable	2018-01-29	3	-23/+35
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set alternate object directories in run_git See merge request gitlab-org/gitlab-ce!16715
\| * \| \| \| \| \| \|	Set alternate object directories in run_git	Jacob Vosmaer (GitLab)	2018-01-29	3	-23/+35
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '42290-pass-BUNDLE_PATH' into 'master'	Rémy Coutable	2018-01-29	2	-2/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Make tests running bundle install for gitaly more flexible" Closes #42290 See merge request gitlab-org/gitlab-ce!16654
\| * \| \| \| \| \| \|	Pass BUNDLE_PATH to install to the same path for test42290-pass-BUNDLE_PATH	Lin Jen-Shin	2018-01-26	2	-2/+10
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'sh-digital-ocean-s3-docs' into 'master'	Achilleas Pipinellis	2018-01-29	1	-8/+10
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Digital Ocean Spaces now supports AWS v4 streaming API See merge request gitlab-org/gitlab-ce!16745
\| * \| \| \| \| \|	Digital Ocean Spaces now supports AWS v4 streaming API	Stan Hu	2018-01-28	1	-8/+10
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://github.com/fog/fog-aws/issues/428#issuecomment-360869183
* \| \| \| \| \|	Merge branch 'generalize-js-toggle-buttons' into 'master'	Filipa Lacerda	2018-01-26	12	-155/+225
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generalize toggle_buttons for JavaScript usage See merge request gitlab-org/gitlab-ce!16689
\| * \| \| \| \|	Generalize toggle_buttons.jsgeneralize-js-toggle-buttons	Eric Eastwood	2018-01-26	12	-155/+225
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
* \| \| \| \| \|	Merge branch 'fix/issues-spec' into 'master'	Stan Hu	2018-01-26	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spec failures in issues_spec.rb Closes #42488 See merge request gitlab-org/gitlab-ce!16744
\| * \| \| \| \| \|	Fix spec failures in issues_spec.rb	Ahmad Sherif	2018-01-26	1	-2/+2
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'cs-fix-commercial-content-check' into 'master'	Robert Speicher	2018-01-26	2	-8/+15
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include the GitLab version info when commercial content on help page is disabled Closes #42486 See merge request gitlab-org/gitlab-ce!16743
\| * \| \| \| \|	Fix #42486.	Connor Shea	2018-01-26	2	-8/+15
\|/ / / / /