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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update wording	Alfredo Sumaran	2016-04-26	2	-3/+3
\|
*	Use click_link	Alfredo Sumaran	2016-04-26	1	-1/+1
\|
*	Add documentation for "Hide whitespace changes" button	Alfredo Sumaran	2016-04-26	5	-4/+4
\|
*	Specs for toggle Whitespaces Changes	Alfredo Sumaran	2016-04-26	1	-0/+22
\|
*	Rename method	Alfredo Sumaran	2016-04-26	1	-4/+4
\|
*	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
\| \|
* \|	Merge branch 'changelog-alternates' into 'master'	Hannes Rosenögger	2016-04-26	3	-2/+39
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow alternative names for the CHANGELOG file. "CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files. Also adds relevant tests for each of these names. Resolves #14864. See merge request !3768
\| * \|	Allow alternative names for the CHANGELOG file.	Connor Shea	2016-04-26	3	-2/+39
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files. Also adds relevant tests for each of these names. Resolves #14864.
* \|	Merge branch 'remove-devise-async' into 'master'	Rémy Coutable	2016-04-26	5	-6/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove devise async The extra gem isn’t necessary anymore since Devise + Rails 4.2 has ActiveJob integration. Fixes #15575. Working towards #14286. cc: @dzaporozhets @rspeicher See merge request !3902
\| * \|	Remove the Devise Async gem.	Connor Shea	2016-04-26	5	-6/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
* \| \|	Merge branch 'patch-1' into 'master'	Rémy Coutable	2016-04-26	1	-0/+13
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add usage example for the Office 365 GetPersonaPhoto-service. See merge request !2462
\| * \|	Add usage example for the Office 365 GetPersonaPhoto-service.	Eirik Lygre	2016-01-17	1	-0/+13
\| \| \|
* \| \|	Merge branch 'skip-fresh-repo-fsck' into 'master'	Rémy Coutable	2016-04-26	2	-6/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'patch-3' into 'master'	Rémy Coutable	2016-04-26	1	-11/+24
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Emphasize that GitLab must be partially running when restoring backups. This caused me a lot of pain until I caught on. I also enhanced the GitLab Omnibus application data backup restore procedure. I verified the procedure by executing it with GitLab 8.6.4. See merge request !3844
\| * \| \| \| \|	Emphasize that GitLab must be partially running when restoring backups.	John McGehee	2016-04-20	1	-11/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This caused me a lot of pain until I caught on. I also enhanced the GitLab Omnibus application data backup restore procedure. I verified the procedure by executing it with GitLab 8.6.4.
* \| \| \| \| \|	Merge branch 'search-ui-update' into 'master'	Robert Speicher	2016-04-26	16	-149/+265
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Search ui update Closes #2537 See merge request !3751
\| * \| \| \| \| \|	Updated based on feedbacksearch-ui-update	Phil Hughes	2016-04-26	4	-14/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CHANGELOG item
\| * \| \| \| \| \|	Fixed tests	Phil Hughes	2016-04-26	3	-2/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Revert "Merge branch 'patch-2' into 'master'"	Rémy Coutable	2016-04-26	1	-39/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !3839
* \| \| \| \| \| \|	Merge branch 'patch-2' into 'master'	Rémy Coutable	2016-04-26	1	-20/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document that only unicorn and sidekiq should be stopped. And the rest of GitLab should remain running. Also clarified the rest of the GitLab Omnibus restore procedure. See merge request !3839
\| * \| \| \| \| \| \|	Document that only unicorn and sidekiq should be stopped.	John McGehee	2016-04-20	1	-20/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And the rest of GitLab should remain running. Also clarified the rest of the GitLab Omnibus restore procedure.
* \| \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Rémy Coutable	2016-04-26	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update PROCESS.md Fix grammar by adding missing "we" Add extra newline so example isn't part of list. See merge request !3845
\| * \| \| \| \| \| \|	Update PROCESS.md	Mark Pundsack	2016-04-21	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar by adding missing "we" Add extra newline so example isn't part of list.
* \| \| \| \| \| \| \|	Merge branch '15094-throttle-update-of-last_activity_at' into 'master'	Jacob Vosmaer	2016-04-26	3	-23/+45
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-23/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'upgrade-gitlab-grit' into 'master'	Robert Speicher	2016-04-25	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version dependency. Changelog for mime-types: https://github.com/mime-types/ruby-mime-types/blob/master/History.rdoc Resolves #15101. See merge request !3901
\| * \| \| \| \| \| \| \|	Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version ↵	Connor Shea	2016-04-24	1	-3/+3
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dependency. Resolves #15101.
* \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \|