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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use new method hide_whitespaces?	Alfredo Sumaran	2016-04-26	1	-1/+1
\|
*	Update syntax	Alfredo Sumaran	2016-04-26	1	-2/+2
\|
*	Hide whitespace toggle button for new merge requests	Alfredo Sumaran	2016-04-26	2	-5/+7
\|
*	Add Hide/show whitespace changes button on diff and commit view	Alfredo Sumaran	2016-04-26	2	-0/+26
\|
*	Merge branch '15606-discussion-styling' into 'master'	Jacob Schatz	2016-04-26	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Increase screen width breakpoint for hide/show discussion Closes #15606 See merge request !3915
\| *	Increase screen width breakpoint for hide/show discussion15606-discussion-styling	Annabel Dunstone	2016-04-25	1	-1/+1
\| \|
* \|	Allow alternative names for the CHANGELOG file.	Connor Shea	2016-04-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files. Also adds relevant tests for each of these names. Resolves #14864.
* \|	Remove the Devise Async gem.	Connor Shea	2016-04-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
* \|	Merge branch 'skip-fresh-repo-fsck' into 'master'	Rémy Coutable	2016-04-26	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not fsck projects less than a day old This should bring the number of false positives down. Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423 See merge request !3926
\| * \|	Do not fsck projects less than a day old	Jacob Vosmaer	2016-04-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	This should bring the number of false positives down.
* \| \|	Merge branch 'master' into 'master'	Jacob Schatz	2016-04-26	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed width of .search-location-badge as it was causing issues in Safari. Fixed width of .search-location-badge as it was causing issues in Safari. Fixes issue #15541 and is a minor CSS only change so [ci skip] # Before Safari: ![Screen_Shot_2016-04-24_at_22.35.38](/uploads/74388670fde3af94429d83b954833bd3/Screen_Shot_2016-04-24_at_22.35.38.png) # After Safari: ![Screen_Shot_2016-04-24_at_21.59.49](/uploads/177d0d8fda665165dff5006930604fc6/Screen_Shot_2016-04-24_at_21.59.49.png) Chrome: ![Screen_Shot_2016-04-24_at_21.59.40](/uploads/6764cd5864901210f4f8eff4388fd6db/Screen_Shot_2016-04-24_at_21.59.40.png) # CSS class referenced in the following files: `./app/assets/javascripts/search_autocomplete.js.coffee` `./app/assets/stylesheets/pages/search.scss` …and is visible on the search bar on every page. See merge request !3900
\| * \| \|	Fixed width of .search-location-badge as it was causing issues in Safari. #15541	Jedidiah Broadbent	2016-04-24	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'search-ui-update' into 'master'	Robert Speicher	2016-04-26	13	-149/+258
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Search ui update Closes #2537 See merge request !3751
\| * \| \|	Updated based on feedbacksearch-ui-update	Phil Hughes	2016-04-26	3	-13/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed some variable names Fixed CHANGELOG entry
\| * \| \|	Consistent border radius	Phil Hughes	2016-04-26	3	-4/+2
\| \| \| \|
\| * \| \|	Correctly shows no results text	Phil Hughes	2016-04-26	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct search results count
\| * \| \|	Fixed issue with dropdown option not sticking	Phil Hughes	2016-04-26	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CHANGELOG item
\| * \| \|	Fixed tests	Phil Hughes	2016-04-26	1	-2/+6
\| \| \| \|
\| * \| \|	Humanize scope text	Phil Hughes	2016-04-26	2	-3/+3
\| \| \| \|
\| * \| \|	Truncate issue description	Phil Hughes	2016-04-26	1	-1/+1
\| \| \| \|
\| * \| \|	Focus field	Phil Hughes	2016-04-26	1	-0/+1
\| \| \| \|
\| * \| \|	Use helper method	Phil Hughes	2016-04-26	1	-8/+2
\| \| \| \|
\| * \| \|	Changes dropdown toggle on search dropdowns	Phil Hughes	2016-04-26	2	-14/+22
\| \| \| \|
\| * \| \|	Removed category icons	Phil Hughes	2016-04-26	1	-66/+39
\| \| \| \|
\| * \| \|	icons on search bar	Phil Hughes	2016-04-26	5	-6/+65
\| \| \| \|
\| * \| \|	Mobile updates for search UI	Phil Hughes	2016-04-26	4	-24/+44
\| \| \| \|
\| * \| \|	Loads group & projects on search page with ajax	Phil Hughes	2016-04-26	3	-24/+58
\| \| \| \|
\| * \| \|	Started updating search UI	Phil Hughes	2016-04-26	8	-31/+49
\| \| \| \|
* \| \| \|	Merge branch '15094-throttle-update-of-last_activity_at' into 'master'	Jacob Vosmaer	2016-04-26	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Throttle the update of `project.last_activity_at` to 1 minute This implement [the solution](https://gitlab.com/gitlab-org/gitlab-ce/issues/15094#note_4769387) proposed by @jacobvosmaer. See merge request !3848
\| * \| \|	Throttle the update of `project.last_activity_at` to 1 minute15094-throttle-update-of-last_activity_at	Rémy Coutable	2016-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'link_user_avatar_in_activity_page_to_profile' into 'master'	Robert Speicher	2016-04-25	1	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link user avatar in activity page to user profile Closes #14927 See merge request !3910
\| * \| \| \|	link user avatar in activity page to user profilelink_user_avatar_in_activity_page_to_profile	Arinde Eniola	2016-04-25	1	-1/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'emoji-unicode-fix' into 'master'	Jacob Schatz	2016-04-25	2	-17/+4
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with emoji comments not showing correct emoji image Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512 See merge request !3885
\| * \| \| \|	Removed usage of normilizeEmojiName methodemoji-unicode-fix	Phil Hughes	2016-04-22	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed some Ruby based on feedback
\| * \| \| \|	Fixes issue with emoji comments not showing correct emoji image	Phil Hughes	2016-04-22	2	-13/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512
* \| \| \| \|	Merge branch 'diff-line-colors' into 'master'	Jacob Schatz	2016-04-25	3	-8/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update diff blue & yellow to match design <img src="/uploads/60e1351fb04ab1c8969685fbc8b61c88/Screen_Shot_2016-04-22_at_9.12.17_AM.png" width="500px"> <img src="/uploads/6812b22ec53f3041811261daa0584822/Screen_Shot_2016-04-22_at_9.12.05_AM.png" width="500px"> See merge request !3883
\| * \| \| \| \|	Update diff blue & yellow to match designdiff-line-colors	Annabel Dunstone	2016-04-22	3	-8/+16
\| \|/ / / /
* \| \| \| \|	Merge branch 'blur-award-btn' into 'master'	Jacob Schatz	2016-04-25	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Triggers blur after clicking award button ![blur](/uploads/6cd53a5ac314e8048c656685935747e2/blur.gif) Fixes #15511 See merge request !3881
\| * \| \| \| \|	Triggers blur after clicking award buttonblur-award-btn	Phil Hughes	2016-04-22	1	-0/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #15511
* \| \| \| \|	Merge branch 'issue_14904' into 'master'	Jacob Schatz	2016-04-25	7	-50/+95
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new shortcuts Closes #14904 - On a project: `i` To navigate to New Issue page. - On a issuable: `l` To open Label dropdown on a issuable. - Global: Typing `?` multiple times now toggles the modal. See merge request !3686
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into issue_14904	Alfredo Sumaran	2016-04-21	59	-369/+437
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Use gon.shortcuts_path directly	Alfredo Sumaran	2016-04-21	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move event handlers to methods	Alfredo Sumaran	2016-04-21	1	-10/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into issue_14904	Alfredo Sumaran	2016-04-20	42	-181/+655
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/shared/issuable/_sidebar.html.haml
\| * \| \| \| \| \| \|	Make shortcuts work when sidebar is collapsed	Alfredo Sumaran	2016-04-20	3	-35/+54
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into issue_14904	Alfredo Sumaran	2016-04-20	97	-377/+758
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Expose shortcuts url from the backend via gon	Alfredo Sumaran	2016-04-18	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
\| * \| \| \| \| \| \| \|	Use proper method	Alfredo Sumaran	2016-04-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix specs	Alfredo Sumaran	2016-04-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update shortcuts dialog	Alfredo Sumaran	2016-04-18	1	-1/+13
\| \| \| \| \| \| \| \| \|