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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-git	Ahmad Sherif	2018-01-30	2	-19/+19
\| \| \| \|	Fixes #42544
*	Merge branch 'fix-cache-clear-windows' into 'master'	Kamil Trzciński	2018-01-29	3	-2/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix cache clear windows Closes #42487 See merge request gitlab-org/gitlab-ce!16740
\| *	Merge branch 'master' into fix-cache-clear-windowsfix-cache-clear-windows	Matija Čupić	2018-01-27	15	-165/+242
\| \|\
\| * \|	Add CHANGELOG entry	Matija Čupić	2018-01-26	1	-0/+5
\| \| \|
\| * \|	Replace : with _ in cache key versioning	Matija Čupić	2018-01-26	2	-2/+2
\| \| \|
* \| \|	Merge branch '42553-fix-commit-spec' into 'master'	Rémy Coutable	2018-01-29	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Intermittent spec failure in spec/models/commit_spec.rb" Closes #42553 See merge request gitlab-org/gitlab-ce!16768
\| * \| \|	Fix an order dependency in a spec	Nick Thomas	2018-01-29	1	-3/+3
\|/ / /
* \| \|	Merge branch 'osw-fix-lost-diffs-when-source-branch-deleted' into 'master'	Rémy Coutable	2018-01-29	4	-5/+43
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Close and do not reload MR diffs when source branch is deleted Closes #37775 See merge request gitlab-org/gitlab-ce!16690
\| * \| \|	Close and do not reload MR diffs when source branch is deleted	Oswaldo Ferreira	2018-01-29	4	-5/+43
\|/ / /
* \| \|	Merge branch 'fl-vue-mr-widget' into 'master'	Phil Hughes	2018-01-29	4	-251/+290
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move mr_widget_merged into a vue file Closes #42486 See merge request gitlab-org/gitlab-ce!16746
\| * \| \|	Fix broken testfl-vue-mr-widget	Filipa Lacerda	2018-01-29	1	-2/+2
\| \| \| \|
\| * \| \|	[ci skip] Merge branch 'master' into fl-vue-mr-widget	Filipa Lacerda	2018-01-29	39	-395/+500
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (21 commits) normalize headers correctly i18n flash message fixed dashboard projects not being filterable Converted filterable_list to axios Converted due_date_select to axios Converted dropzone_input to axios Converted create_merge_request_dropdown to axios converted compare_autocomplete to axios Convered compare.js to axios Set alternate object directories in run_git Digital Ocean Spaces now supports AWS v4 streaming API Fix spec failures in issues_spec.rb Fix #42486. Generalize toggle_buttons.js update code based on feedback add changelog fix spec add spec disable retry attempts for Import/Export until that is fixed add an extra spec fix validation error on services ...
\| * \| \| \|	Move mr_widget_merged into a vue file	Filipa Lacerda	2018-01-26	4	-251/+290
\| \| \| \| \|
* \| \| \| \|	Merge branch 'limit-never-zero' into 'master'	Robert Speicher	2018-01-29	6	-26/+40
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't allow Repository#log with limit zero See merge request gitlab-org/gitlab-ce!16674
\| * \| \| \| \|	Don't allow Repository#log with limit zero	Jacob Vosmaer (GitLab)	2018-01-29	6	-26/+40
\|/ / / / /
* \| \| \| \|	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
\| \| \| \| \| \| \| \|