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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '40468-empty-states' into 'master'	Tim Zallmann	2017-12-13	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update styling of empty states" Closes #40468 See merge request gitlab-org/gitlab-ce!15791
\| *	Merge branch 'master' into 40468-empty-states	Filipa Lacerda	2017-12-12	49	-380/+749
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (54 commits) Updated image for diff navigation docs Milestone sidebar docs Use app host instead of asset host when rendering image blob or diff ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build Use shared interceptor in note specs Ignore temporary table in schema Check for null in job tooltip title Clarify casing of I18N placeholder names fixes some markup issues in the js style guide docs Fix migration that removes issues.branch_name small change to make less conflict with EE version Add cop for use of remove_column Resolve merge conflicts with dev.gitlab.org/master after security release add index for doc/administration/operations/ Remove RubySampler#sample_objects for performance as well Bugfix: User can't change the access level of an access requester Add spec for removing issues.assignee_id updated imports Keep track of storage check timings Remove a header level in the new 'Automatic CE->EE merge' doc ...
\| * \|	Fix broken test	Filipa Lacerda	2017-12-11	1	-1/+1
\| \| \|
* \| \|	Fix spec by avoiding monkeypatching	Michael Kozono	2017-12-12	1	-4/+13
\| \| \|
* \| \|	Merge branch ↵	Robert Speicher	2017-12-12	4	-8/+284
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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
\| * \| \|	Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter	Rémy Coutable	2017-12-12	3	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Refactor member view by using presenter	TM Lee	2017-12-11	3	-8/+272
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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>
* \| \| \|	Merge branch 'zj-memoization-mr-commits' into 'master'	Sean McGivern	2017-12-12	2	-1/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use memoization for commits on diffs See merge request gitlab-org/gitlab-ce!15857
\| * \| \| \|	Fix rubocop offence	Zeger-Jan van de Weg	2017-12-12	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Use memoization for commits on diffs	Zeger-Jan van de Weg	2017-12-12	2	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Gitaly CommitService is being hammered by n + 1 calls, mostly when finding commits. This leads to this gRPC being turned of on production: https://gitlab.com/gitlab-org/gitaly/issues/514#note_48991378 Hunting down where it came from, most of them were due to MergeRequest#show. To prove this, I set a script to request the MergeRequest#show page 50 times. The GDK was being scraped by Prometheus, where we have metrics on controller#action and their Gitaly calls performed. On both occations I've restarted the full GDK so all caches had to be rebuild. Current master, 806a68a81f1baee, needed 435 requests After this commit, 154 requests
* \| \| \| \|	Merge branch 'sophie-h/gitlab-ce-patch-15' into 'master'pawel/update-prometheus_gem_to_highly_optimized_version	Sean McGivern	2017-12-12	3	-0/+153
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide issues and MRs in labels list if disabled See merge request gitlab-org/gitlab-ce!15863
\| * \| \| \| \|	Hide issues and MRs in labels list if disabledsophie-h/gitlab-ce-patch-15	Sophie Herold	2017-12-11	3	-0/+153
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'repo-write-ref-client-prep' into 'master'	Robert Speicher	2017-12-12	2	-2/+20
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move Repository#write_ref to Git::Repository#write_ref Closes gitaly#793 See merge request gitlab-org/gitlab-ce!15712
\| * \| \| \| \| \|	Move Repository#write_ref to Git::Repository#write_refrepo-write-ref-client-prep	Kim "BKC" Carlbäcker	2017-12-12	2	-2/+20
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'optimize-issues-avoid-noop-empty-cache-updates2' into 'master'	Sean McGivern	2017-12-12	1	-0/+20
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Treat empty markdown and html strings as valid cached text, not missing cache… See merge request gitlab-org/gitlab-ce!15856
\| * \| \| \| \| \|	Treat empty markdown and html strings as valid cached text, not missing ↵optimize-issues-avoid-noop-empty-cache-updates2	Greg Stark	2017-12-12	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cache that needs to be updated
* \| \| \| \| \| \|	Merge branch 'single-list-multiple-clusters' into 'master'	Kamil Trzciński	2017-12-12	2	-39/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Single list for multiple clusters See merge request gitlab-org/gitlab-ce!15848
\| * \| \| \| \| \| \|	Remove tab navigation from clusters/index	Matija Čupić	2017-12-11	1	-11/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove cluster scope from ClustersController#index	Matija Čupić	2017-12-11	1	-28/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rc/backport-ee-fix' into 'master'	Kamil Trzciński	2017-12-12	1	-18/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport a spec fix done in EE (5dbecb8e) to CE See merge request gitlab-org/gitlab-ce!15842
\| * \| \| \| \| \| \| \|	Backport a spec fix done in EE (5dbecb8e) to CE	Rémy Coutable	2017-12-11	1	-18/+8
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'jprovazn-description' into 'master'	Sean McGivern	2017-12-12	3	-0/+32
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use message body for merge request description Closes #40968 See merge request gitlab-org/gitlab-ce!15839
\| * \| \| \| \| \| \|	Use message body for merge request descriptionjprovazn-description	Jan Provaznik	2017-12-11	3	-0/+32
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a merge request is created from email, use message body as merge request description. If message body is empty then merge request description is still created from the source branch commit (if there is only single commit in the merge request). If message body is empty and there are multiple commits in the source branch, then merge request description is left empty. Closes #40968
* \| \| \| \| \| \|	Merge branch 'add-js-prefix-issuable-edit' into 'master'	Filipa Lacerda	2017-12-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add js prefix for issuable-edit Closes #40965 See merge request gitlab-org/gitlab-ce!15813
\| * \| \| \| \| \| \|	Add js prefix for issuable-editadd-js-prefix-issuable-edit	Clement Ho	2017-12-08	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master'	Filipa Lacerda	2017-12-12	3	-165/+254
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop "ERROR: TypeError{}" from being logged to the console and fail tests Closes #37619 See merge request gitlab-org/gitlab-ce!15830
\| * \| \| \| \| \| \| \|	Use shared interceptor in note specs37619-fix-vue-typeerror-not-failing-the-build	Eric Eastwood	2017-12-11	2	-205/+215
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Try to clean up legit Vue error that was patched over	Eric Eastwood	2017-12-10	2	-22/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859
\| * \| \| \| \| \| \| \|	Add Vue errorHandlor to remove rogue logged TypeErrors	Eric Eastwood	2017-12-10	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859
* \| \| \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-12-12	1	-0/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-build' into 'master' Job dropping by MissingDependenciesError should consider StaleObjectError Closes #41023 See merge request gitlab-org/gitlab-ce!15873
\| * \| \| \| \| \| \| \| \|	ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-build	Shinya Maeda	2017-12-12	1	-0/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '40997-pipeline-null' into 'master'	Phil Hughes	2017-12-12	1	-0/+31
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Checks for null in job tooltip title Closes #40997 See merge request gitlab-org/gitlab-ce!15869
\| * \| \| \| \| \| \| \| \| \|	Check for null in job tooltip title40997-pipeline-null	Filipa Lacerda	2017-12-11	1	-0/+31
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master'	Tim Zallmann	2017-12-12	1	-8/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix comment on image discussion icon alignment (update icons) Closes #39608 See merge request gitlab-org/gitlab-ce!15760
\| * \| \| \| \| \| \| \| \| \|	Fix comment on image discussion icon alignment39608-comment-on-image-discussions-tab-alignment	Eric Eastwood	2017-12-08	1	-8/+1
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39608 Use SVG icons to avoid having to position things See https://gitlab.com/gitlab-org/gitlab-ce/issues/39608#note_50088917
* \| \| \| \| \| \| \| \| \|	Merge branch 'issue-note-rename' into 'master'	Fatih Acet	2017-12-11	6	-9/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rename remaining issue_ prefixed files See merge request gitlab-org/gitlab-ce!15818
\| * \| \| \| \| \| \| \| \| \|	rename remaining issue_ prefixed filesissue-note-rename	Simon Knox	2017-12-09	6	-9/+9
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'gitaly-mirroring-prep' into 'master'	Robert Speicher	2017-12-11	1	-18/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly mirroring migration prep Closes gitaly#816 See merge request gitlab-org/gitlab-ce!15775
\| * \| \| \| \| \| \| \| \| \| \|	Add feature flag to use gitaly-ssh mirroring when cloning internal repos	Alejandro Rodríguez	2017-12-06	1	-18/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also allows us to simplify the naming since we can make some fetching methods private.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'backport-epic-in-issue' into 'master'	Jacob Schatz	2017-12-11	2	-24/+30
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport epic in issue See merge request gitlab-org/gitlab-ce!15799
\| * \| \| \| \| \| \| \| \| \| \|	Backport epic in issueepic-in-issue backport-epic-in-issue	Clement Ho	2017-12-07	2	-24/+30
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'url-utility-es-module' into 'master'	Filipa Lacerda	2017-12-11	19	-63/+68
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved URL utility methods into exported es modules See merge request gitlab-org/gitlab-ce!15783
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into 'url-utility-es-module'	Phil Hughes	2017-12-11	49	-272/+1260
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/issue_show/components/app.vue
\| * \| \| \| \| \| \| \| \| \| \|	fix missed gl.utils.visitUrl spy	Phil Hughes	2017-12-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	remove utl util imports from boards specs	Phil Hughes	2017-12-08	3	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	use exported methods instead of gl.utils	Phil Hughes	2017-12-08	16	-58/+66
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '35724-animate-sidebar' into 'master'	Filipa Lacerda	2017-12-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Animate contextual sidebar; change class names for easier readability Closes #35724 See merge request gitlab-org/gitlab-ce!15797
\| * \| \| \| \| \| \| \| \| \| \|	Animate contextual sidebar; change class names for easier readability	Annabel Dunstone Gray	2017-12-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-remove-column-cop' into 'master'	Rémy Coutable	2017-12-11	1	-0/+68
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cop for use of remove_column See merge request gitlab-org/gitlab-ce!15855
\| * \| \| \| \| \| \| \| \| \| \|	Add cop for use of remove_columnadd-remove-column-cop	Sean McGivern	2017-12-11	1	-0/+68
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove_column should only be used in the up (or change) step of a migration if it's a post-deployment migration. Otherwise there will be downtime due to the ActiveRecord column cache, which we can avoid by using the IgnorableColumn concern in combination with a post-deployment migration.