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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix Git protocol v2 e2e testqa-fix-git-protocol-v2-spec	Mark Lapierre	2018-11-14	1	-2/+2
\| \| \| \|	Remove references to `Factory`
*	Merge branch 'mr-expand-all-collapsed-files' into 'master'	Filipa Lacerda	2018-11-14	2	-3/+37
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix collapsed files not fully fully expanding Closes #53866 See merge request gitlab-org/gitlab-ce!23019
\| *	Fix collapsed files not fully fully expanding	Phil Hughes	2018-11-13	2	-3/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes files that are collapsed by default not expanding when the expand all button is clicked. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53866
* \|	Merge branch '53636-fix-rendering-of-any-user-filter' into 'master'	Clement Ho	2018-11-14	3	-17/+54
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable updating appearance of filter tokens for special values Closes #53636 See merge request gitlab-org/gitlab-ce!22865
\| * \|	Disable updating appearance of filter tokens for special values	Heinrich Lee Yu	2018-11-14	3	-17/+54
\|/ /
* \|	Merge branch 'docs/markup-languages' into 'master'	Marcia Ramos	2018-11-14	1	-10/+24
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add a new markup languages section See merge request gitlab-org/gitlab-ce!22921
\| * \|	Add a new markup languages sectiondocs/markup-languages	Achilleas Pipinellis	2018-11-09	1	-10/+24
\| \| \|
* \| \|	Merge branch 'gt-show-navigation-line-separator-ce' into 'master'	Nick Thomas	2018-11-14	2	-5/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show navigation line separator when instance metrics is disabled See merge request gitlab-org/gitlab-ce!22940
\| * \| \|	Show navigation line separator when instance metrics is disabled	George Tsiolis	2018-11-13	2	-5/+13
\| \| \| \|
* \| \| \|	Merge branch 'winh-frontend-testing-slash-docs' into 'master'	Tim Zallmann	2018-11-14	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing slash in frontend testing guide See merge request gitlab-org/gitlab-ce!23027
\| * \| \| \|	Add missing slash in frontend testing guidewinh-frontend-testing-slash-docs	Winnie Hellmann	2018-11-13	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'switch-rails' into 'master'	Sean McGivern	2018-11-14	23	-797/+741
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch to Rails 5 Closes #14286 and #48991 See merge request gitlab-org/gitlab-ce!21492
\| * \| \| \| \|	Minor gem fixesswitch-rails	Jan Provaznik	2018-11-14	3	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Add ApplicationRecord model class	Jan Provaznik	2018-11-14	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Rails 5 all models by default inherit from ApplicationRecord.
\| * \| \| \| \|	Addressed documentation comments	Jan Provaznik	2018-11-14	1	-9/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Address specs failing in rails 4	Jan Provaznik	2018-11-14	3	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to run CI with rails 4 for a short-term (until we are sure that we will ship with rails 5). The problem is that rails 4 can not handle rails 5 schema.rb properly - specifically `t.index` directive can not handle multiple indexes on the same column. Because combination of rails 4 + rails 5 schema will be used only in CI for a short-term, we can just ignore these incompatibility failures. This patch adds `rails5` helper for specs.
\| * \| \| \| \|	Fix trigerring of rails 4 tests in CI	Jan Provaznik	2018-11-14	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add missing changelog	Jan Provaznik	2018-11-14	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Make rails5 defailt in bin/* scripts	Jan Provaznik	2018-11-14	3	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Add rails5 doc	Jan Provaznik	2018-11-14	2	-0/+16
\| \| \| \| \| \|
\| * \| \| \| \|	Update db/schema.rb according to Rails 5	Jan Provaznik	2018-11-14	1	-535/+402
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add_index replaced with t.index * intiger(size 8) replaced with bigint
\| * \| \| \| \|	Fix index for mysql adapter	Jan Provaznik	2018-11-14	1	-16/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* similar to rails 5 it assures that index length is set for blob columns also in rails 4 * it also ignores multiple definitions of indexes for mysql, for some tables we define multiple indexes on the same set of columns, but with different parameters (opclasses, where), these are not supported by mysql adapter so the second definition of index is skipped
\| * \| \| \| \|	Switch rails 4 to 5 in gitlab-ci	Jan Provaznik	2018-11-14	3	-93/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI jobs will be triggered both with rails 4 and 5 to make sure we keep backward compatibility if it turns out we have to switch back to rails 4. Rails 4 jobs are not allowed to fail for now, these jobs will be removed in a follow-up MR next cycle.
\| * \| \| \| \|	Switch to Rails 5 by default	Jan Provaznik	2018-11-14	8	-146/+153
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* updates Gemfile * uses Rails 5 unless explicitly disabled
* \| \| \| \| \|	Merge branch 'move-assets-compile-sooner' into 'master'	Marin Jankovski	2018-11-14	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move cloud-native-image to the post-test stage Closes charts/gitlab#897 See merge request gitlab-org/gitlab-ce!22942
\| * \| \| \| \| \|	Removing extra option for gitlab:assets:compilemove-assets-compile-sooner	Ian Baum	2018-11-13	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Don't need to specify stage as it is inherited from the job template
\| * \| \| \| \| \|	Move cloud-native-image job to the post-test stage	Ian Baum	2018-11-13	1	-1/+2
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* The job depends on asset image created as part of the gitlab:assets:compile job. https://gitlab.com/charts/gitlab/issues/897
* \| \| \| \| \|	Merge branch 'sh-bump-workhorse-7-1-1' into 'master'	Nick Thomas	2018-11-14	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump GitLab Workhorse to 7.1.1 See merge request gitlab-org/gitlab-ce!23053
\| * \| \| \| \| \|	Bump GitLab Workhorse to 7.1.1	Stan Hu	2018-11-14	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This version now supports redis[s]:// URL schemes.
* \| \| \| \| \|	Merge branch 'bump-binding_of_caller-gem-to-0-8-0' into 'master'	Stan Hu	2018-11-14	3	-7/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump `binding_of_caller` gem version to 0.8.0 See merge request gitlab-org/gitlab-ce!23040
\| * \| \| \| \| \|	Bump `binding_of_caller` gem version to 0.8.0	Shinya Maeda	2018-11-14	3	-7/+7
\|/ / / / / /
* \| \| \| \| \|	Merge branch ↵	Phil Hughes	2018-11-14	2	-2/+7
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted' into 'master' Resolve "Activity Feed - Missing padding in event note when a branch is deleted" Closes #54002 See merge request gitlab-org/gitlab-ce!23038
\| * \| \| \| \|	Resolve "Activity Feed - Missing padding in event note when a branch is deleted"	Martin Wortschack	2018-11-14	2	-2/+7
\|/ / / / /
* \| \| \| \|	Merge branch '53816-empty-label-menu-if-not-logged-in' into 'master'	Rémy Coutable	2018-11-14	2	-22/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Empty label menu if not logged in" Closes #53816 See merge request gitlab-org/gitlab-ce!23042
\| * \| \| \| \|	Removes promote to group label for anonymous user	Jacopo	2018-11-14	2	-22/+28
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'revert-4ff91723' into 'master'	Andreas Brandl	2018-11-14	4	-32/+95
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'revert-drop-gcp-clusters-table' into 'master'" See merge request gitlab-org/gitlab-ce!23020
\| * \| \| \| \| \|	Revert "Merge branch 'revert-drop-gcp-clusters-table' into 'master'"	Kamil Trzciński	2018-11-14	4	-32/+95
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'fix-deployment-metrics-in-mr-widget' into 'master'	Kamil Trzciński	2018-11-14	4	-4/+50
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid returning deployment metrics url to MR widget when the deployment is not successful Closes #53870 See merge request gitlab-org/gitlab-ce!23010
\| * \| \| \| \| \|	Avoid returning deployment metrics url to MR widget when the deployment is ↵	Shinya Maeda	2018-11-14	4	-4/+50
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not successful
* \| \| \| \| \|	Merge branch '53922-sentry-errors-for-k8s-integration' into 'master'	Kamil Trzciński	2018-11-14	4	-3/+38
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Track Kubernetes errors using Sentry Closes #53922 See merge request gitlab-org/gitlab-ce!23026
\| * \| \| \| \| \|	Track Kubernetes errors using Sentry	Dylan Griffith	2018-11-14	4	-3/+38
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'patch-31' into 'master'	Rémy Coutable	2018-11-14	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update comment in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!23013
\| * \| \| \| \| \|	Update Auto-DevOps.gitlab-ci.yml	Tripple Moon	2018-11-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Typo in comment INCREMENTAL_ROLLOUT_TYPE => INCREMENTAL_ROLLOUT_MODE
* \| \| \| \| \| \|	Merge branch 'add-documentation-for-git-operations-stack-trace' into 'master'	Douwe Maan	2018-11-14	1	-0/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds documentation of git trace when git push/pull times out See merge request gitlab-org/gitlab-ce!23016
\| * \| \| \| \| \| \|	Adds comma after "timings" in git troubleshooting documentation	Tiago Botelho	2018-11-14	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Adds documentation of git trace when git push/pull times outadd-documentation-for-git-operations-stack-trace	Tiago Botelho	2018-11-13	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a detailed explanation on what the user can expect to see in case a git pull or push operation times out on their local machines
* \| \| \| \| \| \| \|	Merge branch '52940-fix-internal-email-pattern-not-respected' into 'master'	Douwe Maan	2018-11-14	3	-7/+12
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a bug where internal email pattern wasn't respected Closes #52940 See merge request gitlab-org/gitlab-ce!22516
\| * \| \| \| \| \| \|	Fix a bug where internal email pattern wasn't respected52940-fix-internal-email-pattern-not-respected	Rémy Coutable	2018-11-13	3	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'patch-31' into 'master'fix-missing-prometheus-manage-button	Achilleas Pipinellis	2018-11-14	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update events.md. See merge request gitlab-org/gitlab-ce!23021
\| * \| \| \| \| \| \| \|	Update events.md.	Viktor	2018-11-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"?" instead of "&" in request examples