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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix specmention-all	Douwe Maan	2015-12-25	1	-0/+2
\|
*	Merge branch 'master' into mention-all	Douwe Maan	2015-12-24	24	-50/+218
\|\
\| *	Update CHANGELOG	Robert Speicher	2015-12-24	1	-1/+3
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Robert Speicher	2015-12-24	1	-8/+8
\| \|\
\| \| *	Merge pull request #9915 from huacnlee/avoid-ability-methods-allocations	Dmitriy Zaporozhets	2015-12-24	1	-8/+8
\| \| \|\ \| \| \| \| \| \| \| \|	Avoid allocations in Ability class.
\| \| \| *	Avoid allocations in Ability class.	Jason Lee	2015-12-16	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It won't change anything after they are first invoke, so add method cache to avoid allocations and avoid GC. Benchmarks: ``` Calculating ------------------------------------- project_guest_rules without method cache 79.352k i/100ms project_guest_rules with method cache 93.634k i/100ms ------------------------------------------------- project_guest_rules without method cache 2.865M (±32.5%) i/s - 11.982M project_guest_rules with method cache 4.419M (± 7.4%) i/s - 22.004M Comparison: project_guest_rules with method cache: 4418908.0 i/s project_guest_rules without method cache: 2864514.0 i/s - 1.54x slower Calculating ------------------------------------- project_report_rules without method cache 53.126k i/100ms project_report_rules with method cache 97.473k i/100ms ------------------------------------------------- project_report_rules without method cache 1.093M (±36.5%) i/s - 4.675M project_report_rules with method cache 4.420M (± 7.2%) i/s - 22.029M Comparison: project_report_rules with method cache: 4420054.3 i/s project_report_rules without method cache: 1092509.6 i/s - 4.05x slower ``` https://gist.github.com/huacnlee/b04788ae6df42fe769e4
\| * \| \|	Merge branch 'fix-changelog' into 'master'	Robert Speicher	2015-12-24	1	-5/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move changelog items to their correct place. Fixes #4236 See merge request !2201
\| \| * \| \|	Move changelog items to their correct place.	Douwe Maan	2015-12-24	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'ldap-special-chars-fix' into 'master'	Douwe Maan	2015-12-24	4	-4/+20
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix identity and user retrieval when special characters are used Fixes #4023 I also added tests to make sure the user with special characters in his name is returned correctly. @rspeicher this probably should be added to 8.3 as a patch. See merge request !2176
\| \| * \| \| \|	No mb_chars needed anymoreldap-special-chars-fix	Douwe Maan	2015-12-24	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Fix identity and user retrieval when special characters are used	Patricio Cano	2015-12-22	4	-3/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'emoji_picker_frequently_used' into 'master'	Valery Sizov	2015-12-24	3	-3/+31
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Emoji picker: add "frequently used" category depend on !2172 ![Screen_Shot_2015-12-24_at_16.39.04](/uploads/7117173c6f519282054bcb1b7ba248f4/Screen_Shot_2015-12-24_at_16.39.04.png) See merge request !2180
\| \| * \| \| \|	added default for frequently used emojis	Valery Sizov	2015-12-24	2	-10/+11
\| \| \| \| \| \|
\| \| * \| \| \|	fix of frequently used emojis	Valery Sizov	2015-12-24	1	-3/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'emoji-picker-search' into emoji_picker_frequently_used	Valery Sizov	2015-12-24	54	-341/+993
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'emoji-picker-search'into emoji_picker_frequently_usedemoji_picker_frequently_used	Valery Sizov	2015-12-24	329	-1939/+17218
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	add frequently used category to emoji picker	Valery Sizov	2015-12-22	2	-0/+29
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	TYPO in the comment	Valery Sizov	2015-12-22	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	customize niceScroll	Valery Sizov	2015-12-22	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	add some spinach	Valery Sizov	2015-12-22	2	-0/+12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	fix specs	Valery Sizov	2015-12-22	3	-10/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	emoji picker: minor fixes	Valery Sizov	2015-12-22	1	-8/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	emoji css refactoring	Valery Sizov	2015-12-22	1	-1262/+1267
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	base implementation of emoji picker [ci skip]	Valery Sizov	2015-12-22	10	-71/+1412
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix-explore-ui' into 'master'	Dmitriy Zaporozhets	2015-12-24	3	-3/+3
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix explore projects page UI # Before ![Screenshot_2015-12-24_14.13.03](/uploads/fdae7648acc8b8076709e4bfc867a5f8/Screenshot_2015-12-24_14.13.03.png) # After ![Screenshot_2015-12-24_14.11.29](/uploads/b1ecd3bebfadab9d2ceabaae27046271/Screenshot_2015-12-24_14.11.29.png) cc @jschatz1 @skyruler Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2202
\| \| * \| \| \| \| \| \|	Fix explore projects page UIfix-explore-ui	Dmitriy Zaporozhets	2015-12-24	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Merge branch 'fix-master' into 'master'	Douwe Maan	2015-12-24	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix NewBranchForm spec cc @vsizov See merge request !2204
\| \| * \| \| \| \| \| \| \|	Fix NewBranchForm spec	Douwe Maan	2015-12-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'new-project-header-redesign' into 'master'	Dmitriy Zaporozhets	2015-12-24	12	-26/+149
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now Fixes #2876 and #3482 Used existing styles. <br/> Did not attempt to make pixel perfect as styles already exist. <br/> ![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png) See merge request !2156
\| \| * \| \| \| \| \| \| \|	fixes css spacing issuesnew-project-header-redesign	Jacob Schatz	2015-12-23	1	-27/+27
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Moves star code to a class	Jacob Schatz	2015-12-23	4	-37/+27
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	fixes failing test by updating project clone instructions	Jacob Schatz	2015-12-23	4	-10/+14
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into new-project-header-redesign	Jacob Schatz	2015-12-23	21	-44/+93
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	refactoring javascript to put starring functionality in a function	Jacob Schatz	2015-12-23	1	-19/+24
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	spacing changed from 4 to 2 in ` _clone_panel.html.haml`.	Jacob Schatz	2015-12-23	1	-21/+21
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	fixes rebase issue	Jacob Schatz	2015-12-23	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	dropdown chooses right default	Jacob Schatz	2015-12-18	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	adds dropdown for cloning	Jacob Schatz	2015-12-18	3	-15/+49
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	adds starring and unstarring text to star button, also adds partial new styles	Jacob Schatz	2015-12-18	3	-4/+22
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	arrows for buttons	Jacob Schatz	2015-12-18	4	-2/+72
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	spinach tests will pass now	Jacob Schatz	2015-12-23	3	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	dropdown chooses right default	Jacob Schatz	2015-12-23	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	adds dropdown for cloning	Jacob Schatz	2015-12-23	3	-15/+49
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	adds starring and unstarring text to star button, also adds partial new styles	Jacob Schatz	2015-12-23	3	-4/+22
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	arrows for buttons	Jacob Schatz	2015-12-23	4	-2/+72
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Fix specs	Douwe Maan	2015-12-24	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Only allow group/project members to mention `@all`	Douwe Maan	2015-12-24	9	-18/+59
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'emoji-picker-search' into 'master'	Valery Sizov	2015-12-24	7	-3/+49
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| / / / / \| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Emoji picker search depend on !2172 Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3576 !!! Should be merged after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2198 ![Screenshot_2015-12-23_11.44.57](/uploads/01da0b62c3c234307142e2c4db68e53f/Screenshot_2015-12-23_11.44.57.png) See merge request !2186
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into emoji-picker-searchemoji-picker-search	Valery Sizov	2015-12-24	52	-339/+991
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	fix specs	Valery Sizov	2015-12-24	2	-2/+2
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \|