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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'rs-trailingwhitespace-cop' into 'master'	Rémy Coutable	2017-08-16	9	-26/+26
\|\ \| \| \| \| \| \| \| \|	Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573
\| *	Enable Layout/TrailingWhitespace cop and auto-correct offenses	Robert Speicher	2017-08-15	10	-27/+27
\| \|
* \|	Merge branch '34643-fix-project-path-slugify' into 'master'	Rémy Coutable	2017-08-16	2	-5/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CI_PROJECT_PATH_SLUG slugify Closes #34643 See merge request !13350
\| * \|	Fix CI_PROJECT_PATH_SLUG slugify	vanadium23	2017-08-15	2	-5/+6
\| \| \|
* \| \|	Don't create event in Merge Request Create Service	Jarka Kadlecova	2017-08-16	1	-1/+0
\| \| \|
* \| \|	Merge branch 'safari-fly-out-fix' into 'master'	Tim Zallmann	2017-08-16	6	-528/+544
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the fly-out menu in the sidebar not displaying in Safari Closes #36441 See merge request !13445
\| * \| \|	Fix the fly-out menu in the sidebar not displaying in Safarisafari-fly-out-fix	Phil Hughes	2017-08-15	6	-528/+544
\| \|/ /
* \| \|	Merge branch 'fix-autocomplete-group' into 'master'	Phil Hughes	2017-08-16	1	-0/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix username autocomplete group name with no avatar alignment Closes #36502 See merge request !13578
\| * \| \|	Fix username autocomplete group name with no avatar alignmentfix-autocomplete-group	Clement Ho	2017-08-15	1	-0/+10
\| \| \| \|
* \| \| \|	Many Repo Fixes	Jacob Schatz	2017-08-15	28	-375/+469
\|/ / /
* \| \|	Merge branch '36134_confi_touch_up' into 'master'	Jacob Schatz	2017-08-15	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use border radius scss vars See merge request !13360
\| * \| \|	use border radisu scss var36134_confi_touch_up	Regis	2017-08-07	1	-2/+2
\| \| \| \|
* \| \| \|	Repo Editor Fixes	Bryce Johnson	2017-08-15	14	-91/+92
\| \| \| \|
* \| \| \|	Merge branch 'changes-dropdown-unclickable' into 'master'	Clement Ho	2017-08-15	3	-3/+7
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed changed files dropdown not being shown Closes #36479 See merge request !13554
\| * \| \|	Fixed changed files dropdown not being shown	Phil Hughes	2017-08-15	3	-3/+7
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Closes #36479
* \| \|	Merge branch 'fix-btn-alignment' into 'master'	Phil Hughes	2017-08-15	2	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inconsistent spacing for edit buttons on issues and merge request page Closes #36206 See merge request !13547
\| * \ \	Merge branch 'master' into 'fix-btn-alignment'fix-btn-alignment	Clement Ho	2017-08-15	46	-228/+406
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/merge_requests/_nav_btns.html.haml
\| * \| \| \|	Fix inconsistent spacing for edit buttons on issues and merge request page	Clement Ho	2017-08-14	2	-1/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-any-projects-array' into 'master'	Douwe Maan	2017-08-15	1	-0/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow usage of any_projects? with an Array Closes #3646 See merge request !13559
\| * \| \| \|	Allow usage of any_projects? with an Arrayfix-any-projects-array	Yorick Peterse	2017-08-15	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In some cases we pass an Array to this method which would previously fail since Array does not respond to "limit_value". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3646
* \| \| \| \|	Merge branch '36450_confi_polish' into 'master'	Clement Ho	2017-08-15	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change Confidential Message When Visible - UI Polish See merge request !13551
\| * \| \| \| \|	change message and change spec36450_confi_polish	Regis	2017-08-14	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Add two more project templateszj-add-two-more-project-templates	Z.J. van de Weg	2017-08-15	2	-0/+0
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related to !13108. Mostly this is just running the rake task and changing the task a bit to catch cases like the project already existing or so. The rake task moves archives to the vendor/project_template directory, which are checked in too.
* \| \| \|	Display GPG status loading spinner only when Ajax request is made	Winnie Hellmann	2017-08-15	3	-2/+7
\| \| \| \|
* \| \| \|	Merge branch 'forks-count-cache' into 'master'	Douwe Maan	2017-08-15	5	-1/+48
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache the number of forks of a project See merge request !13535
\| * \| \| \|	Cache the number of forks of a projectforks-count-cache	Yorick Peterse	2017-08-14	5	-1/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The number of forks of a project doesn't change very frequently and running a COUNT() every time this information is requested can be quite expensive. We also end up running such a COUNT() query at least twice on the homepage of a project. By caching this data and refreshing it when necessary we can reduce project homepage loading times by around 60 milliseconds (based on the timings of https://gitlab.com/gitlab-org/gitlab-ce).
* \| \| \| \|	Fix edit merge request button inconsistent letter casing	Clement Ho	2017-08-15	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch '34533-speed-up-group-project-authorizations' into 'master'	Douwe Maan	2017-08-15	4	-10/+53
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up Group#user_ids_for_project_authorizations Closes #36182 See merge request !13508
\| * \| \| \| \|	Speed up Group#user_ids_for_project_authorizations	Nick Thomas	2017-08-14	4	-10/+53
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '34371-pipeline-schedule-vue-files' into 'master'	Phil Hughes	2017-08-15	3	-51/+60
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move callout to vue file and remove svg from data function to improve performance See merge request !13539
\| * \| \| \| \|	Adds line to the end of the file34371-pipeline-schedule-vue-files	Filipa Lacerda	2017-08-14	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Move callout to vue file and remove svg from data function to improve ↵	Filipa Lacerda	2017-08-14	3	-51/+60
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	performance
* \| \| \| \|	Merge branch 'repo-fixes-e' into 'master'	Jacob Schatz	2017-08-14	12	-86/+99
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repo fixes part E See merge request !13472
\| * \| \| \| \|	Add shared getFileExtension helper methodrepo-fixes-e	Eric Eastwood	2017-08-14	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146854
\| * \| \| \| \|	Remove unused repo store keys	Eric Eastwood	2017-08-14	2	-17/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37147332
\| * \| \| \| \|	Add comment about why we need to stop parsing JSON	Eric Eastwood	2017-08-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146815 See https://gitlab.slack.com/archives/C0GQHHPGW/p1501779964878178
\| * \| \| \| \|	Use single js- wrapper class to show/hide	Eric Eastwood	2017-08-14	4	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146360
\| * \| \| \| \|	Scroll total scroll width instead of fixed value	Eric Eastwood	2017-08-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed value could potentially be not enough Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145886
\| * \| \| \| \|	Switch single fa icon generation to inline	Eric Eastwood	2017-08-14	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145729
\| * \| \| \| \|	Remove duplicate setting of variable	Eric Eastwood	2017-08-14	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145640
\| * \| \| \| \|	Reset monacoLoading on failure	Eric Eastwood	2017-08-14	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37144070
\| * \| \| \| \|	Remove overflow tabs logic (no longer used)	Eric Eastwood	2017-08-14	2	-15/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143794
\| * \| \| \| \|	Remove loading state from repo_tab	Eric Eastwood	2017-08-14	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143710
\| * \| \| \| \|	Make close/changed icon more accessible	Eric Eastwood	2017-08-14	1	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143527
\| * \| \| \| \|	Use promise syntax with Helper.getContent	Eric Eastwood	2017-08-14	2	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143217
\| * \| \| \| \|	Split out linkClicked and add tests	Eric Eastwood	2017-08-14	1	-24/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143174
\| * \| \| \| \|	Use v-else instead of duplicating logic	Eric Eastwood	2017-08-14	2	-4/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix http://192.168.1.135:3000/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/broadcast_message.js
\| * \| \| \| \|	Move syntax highlighting into a method	Eric Eastwood	2017-08-10	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37142936
* \| \| \| \| \|	Merge branch 'bvl-use-no-wrap-for-pot-file' into 'master'	Rubén Dávila	2017-08-14	2	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove newlines in translations See merge request !13531
\| * \| \| \| \| \|	Remove `\n` from translationsbvl-use-no-wrap-for-pot-file	Bob Van Landuyt	2017-08-14	2	-2/+2
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They seem to confuse some translation tools and aren't rendered in HTML anyway.