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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove 1px whitespace between nav tabs and underline when form presentdz-fix-nav-block	Dmitriy Zaporozhets	2016-04-01	1	-1/+2
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'filter-dropdown-bug' into 'master'	Rémy Coutable	2016-04-01	5	-9/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with dropdowns not selecting values Fixes issue with dropdowns not selecting when navigating between tabs Closes #14813 See merge request !3478
\| *	Fixes issue with dropdowns not selecting valuesfilter-dropdown-bug	Phil Hughes	2016-03-31	5	-9/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with dropdowns not selecting when navigating between tabs Closes #14813
* \|	Merge branch ↵	Douwe Maan	2016-04-01	7	-30/+54
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'snippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764' into 'master' Fix Error 500 when searching for a comment in a project snippet Closes #14764. /cc @stanhu, and thank you for the spec! ;) See merge request !3468
\| * \|	Fix view of notes in search results when noteable is a snippetsnippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764	Rémy Coutable	2016-03-31	4	-26/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, streamline the view. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Rename Note#for_project_snippet? to #for_snippet?	Rémy Coutable	2016-03-31	4	-4/+4
\| \|/ \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into ↵	Douwe Maan	2016-04-01	3	-25/+79
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Mentions on confidential issues doesn't create todos for non-members Closes #14569 See merge request !3374
\| * \|	Mentions on confidential issues doesn't create todos for non-membersfix-mentions-on-confidential-issues-for-non-members	Douglas Barbosa Alexandre	2016-03-30	3	-25/+79
\| \| \|
* \| \|	Merge branch 'fix/issue-move-rewrite-uploads' into 'master'	Douwe Maan	2016-04-01	9	-24/+200
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rewrite uploads when moving issue to another project Closes #14531 See merge request !3382
\| * \| \|	Fix rubocop offenses in upload rewriter specsfix/issue-move-rewrite-uploads	Grzegorz Bizon	2016-03-31	1	-1/+1
\| \| \| \|
\| * \| \|	Add Changelog entry for uploads fix when moving issue	Grzegorz Bizon	2016-03-31	1	-0/+3
\| \| \| \|
\| * \| \|	Merge branch 'master' into fix/issue-move-rewrite-uploads	Grzegorz Bizon	2016-03-31	47	-194/+9317
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (27 commits) Fix commit comment alignment minor cleanup in system_hook_spec Pre-calculate Emoji digests Clear .todo listener Change window.location to use turbolinks Make entire todo row clickable Add 8.6.2 CHANGELOG items Ensure uploads dir exists when running backup specs Move CarrierWave test env config to separate file Remove console logs Off the event initially Collapsed sidebar opens over instead of pushing content. Sidebar collapse update issue User selection from collapsed sidebar Add json response for user avatar in merge request Make changed values visible in minimized sidebar. Fixed MergeRequestController spec We need `sha` reference from `diff_base_commit` to generate the diff Use `diff_base_commit` instead of `target_branch` to generate diffs Isolate CarrierWave uploads in test enviroment ...
\| * \| \|	Improve specs for issue move service	Grzegorz Bizon	2016-03-31	1	-2/+2
\| \| \| \|
\| * \| \|	Extend specs for GFM uploads rewriter	Grzegorz Bizon	2016-03-31	2	-11/+32
\| \| \| \|
\| * \| \|	Remove reduntant `move_to_store` override	Grzegorz Bizon	2016-03-30	3	-16/+10
\| \| \| \|
\| * \| \|	Add method that returns markdown in file uploader	Grzegorz Bizon	2016-03-30	3	-2/+6
\| \| \| \|
\| * \| \|	Check if GFM rewriters need rewrite internally	Grzegorz Bizon	2016-03-30	3	-2/+4
\| \| \| \|
\| * \| \|	Add support for not Active Record based factories	Grzegorz Bizon	2016-03-30	1	-4/+12
\| \| \| \|
\| * \| \|	Refactor uploads rewriter used when moving issue	Grzegorz Bizon	2016-03-30	5	-39/+27
\| \| \| \|
\| * \| \|	Get FileUploader into test harness using factory	Grzegorz Bizon	2016-03-30	3	-6/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This attempts to get CarrierWave's uploader - `FileUploader` into test harness using a factory. that makes it easier to build an instance of it. Along with !3435 it may be easier to use uploaders in tests
\| * \| \|	Add uploads rewriter and use it when moving issue	Grzegorz Bizon	2016-03-30	4	-12/+151
\| \| \| \|
\| * \| \|	Add markdown pattern for uploads to file uploader	Grzegorz Bizon	2016-03-30	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch 'remove-twitter-congrats' into 'master'	Rémy Coutable	2016-04-01	13	-43/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove "Congratulations!" tweet button on newly-created project. I’ve removed everything related to the feature based on this commit: ce08f919bfab73178b2f8c584f34fd8849834365 Resolves #10857. See merge request !3451
\| * \| \| \|	Remove "Congratulations!" tweet button on newly-created project.	connorshea	2016-03-31	13	-43/+6
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
* \| \| \|	Merge branch 'clean-up-user-controller-spec' into 'master'	Robert Speicher	2016-03-31	1	-12/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor clean up on admin/users_controller_spec Extracted from !3439 See merge request !3460
\| * \| \| \|	Minor clean up on admin/users_controller_spec	Zeger-Jan van de Weg	2016-03-31	1	-12/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-input-borders' into 'master'	Jacob Schatz	2016-03-31	4	-8/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix input borders See merge request !3474
\| * \| \| \| \|	Use border color variables for inputfix-input-borders	Dmitriy Zaporozhets	2016-03-31	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Fix icons color in the headerfix-header-colors	Dmitriy Zaporozhets	2016-03-31	3	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'deleted-project-still-stays-visible-and-404-issue-14138' into ↵	Robert Speicher	2016-03-31	7	-12/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Exclude projects pending deletion from all results Closes #14138 See merge request !3439
\| * \| \| \| \| \|	Exclude projects pending deletion from all results	Zeger-Jan van de Weg	2016-03-31	7	-12/+33
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'fix-todos' into 'master'	Rémy Coutable	2016-03-31	7	-2/+45
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Destroy related todos when an Issue/MR is deleted Closes #14550 Closes #14598 See merge request !3376
\| * \| \| \| \| \|	Update CHANGELOGfix-todos	Douglas Barbosa Alexandre	2016-03-31	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove todos for deleted merge requests	Douglas Barbosa Alexandre	2016-03-31	2	-1/+18
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Destroy related todos when an issue is deleted	Douglas Barbosa Alexandre	2016-03-30	4	-1/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix error 500 when target is nil on todo list	Douglas Barbosa Alexandre	2016-03-30	1	-1/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-placeholder-color' into 'master'	Jacob Schatz	2016-03-31	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix placeholder color Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3472
\| * \| \| \| \| \|	Fix placeholder color	Dmitriy Zaporozhets	2016-03-31	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'fix-event-row' into 'master'	Jacob Schatz	2016-03-31	2	-1/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix event rendering for certain event types Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3469
\| * \| \| \| \| \|	Fix event rendering for certain event types	Dmitriy Zaporozhets	2016-03-31	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'issue_3400_port' into 'master'	Jacob Schatz	2016-03-31	11	-157/+613
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Location aware search Closes #3400 #14217 Introduces suggestion grouping on the search box and adds the ability to the user to remove the location to search on. Notes - Suggestions are now grouped by category. - Suggestions are displayed when no location is set. - Would be great to provide suggestions for the specified location which could be a project or group. - A location is set from the server for projects/groups related urls. Default Apparence ![](/uploads/9fad1a354fb0e4b13cfd36698c061ab4/default.gif) When location badge is present ![](/uploads/ddc6379f407061e188f9f4a7a9a8c9b8/location-badge.gif) Suggestions ![suggestions](/uploads/2df288e00ad496b31a1a2efc2a4a9f6d/suggestions.gif) Suggestions when location badge is present ![](/uploads/f6ef09d3aed124179ab4e228b848486e/location-present-suggestions.gif) Closes #3400 See merge request !3212
\| * \| \| \| \| \|	Merge branch 'master' into issue_3400_portissue_3400_port	Alfredo Sumaran	2016-03-29	61	-533/+1347
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/gl_dropdown.js.coffee
\| * \| \| \| \| \| \|	Remove unused CSS	Alfredo Sumaran	2016-03-28	2	-27/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Hide suggestions when deleting all input value using other than backspace	Alfredo Sumaran	2016-03-27	1	-2/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Do not show dropdown menu if when no suggestions returned	Alfredo Sumaran	2016-03-27	1	-4/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add option to submit the typed query	Alfredo Sumaran	2016-03-27	1	-0/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix broken spec	Alfredo Sumaran	2016-03-27	1	-5/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Initialize autocomplete only when search form is present	Alfredo Sumaran	2016-03-26	1	-2/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix SCSS Lint errors	Alfredo Sumaran	2016-03-26	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Always display suggestions	Alfredo Sumaran	2016-03-26	3	-25/+20
\| \| \| \| \| \| \| \|