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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix header link rendering when containing numbersfix-markdown-rendering	Yorick Peterse	2016-04-06	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \|	This fixes the problem where Markdown such as: ### 31st Would get rendered as a link tag pointing to issue number 31 inside a header tag. See gitlab-org/gitlab-ce#14936 for more information.
*	Merge branch 'reorder-language' into 'master'	Yorick Peterse	2016-04-05	1	-4/+14
\|\ \| \| \| \| \| \| \| \|	Update language after doing all other operations See merge request !3533
\| *	Update language only on HEAD of the repositoryreorder-language	Kamil Trzcinski	2016-04-05	1	-4/+14
\| \|
* \|	Merge branch 'fix-gh-pr-import' into 'master'	Yorick Peterse	2016-04-05	2	-0/+31
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Importing repos from GHE doesn't work See merge request !3529
\| * \|	Flush repository cache before import project datafix-gh-pr-import	Douglas Barbosa Alexandre	2016-04-04	2	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitHub Pull Requests importer handle with the repository while importing data, we need to make sure that the cached values are valid.
* \| \|	Wrap images in discussions and wikis with a link to the image source using ↵	connorshea	2016-04-04	2	-1/+25
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ImageLinkFilter. Resolves #14411. See merge request !3464
* \|	Reload forked_project_link projects	Yorick Peterse	2016-04-04	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes ./spec/services/projects/unlink_fork_service_spec.rb which somehow started failing on the master branch. It certainly isn't a very elegant solution but seems to be the easiest/best way of solving this problem for the time being.
* \|	Merge branch 'fix_remove_fork_link' into 'master'	Douwe Maan	2016-04-04	1	-0/+32
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove fork link closes all merge requests opened on source project Currently, if you: - create a fork - open a merge request on the source project - remove the fork link The created MR cannot be closed. With this MR, all pending MR is closed when the fork link is removed. See merge request !3189
\| * \|	Fix rubocop in unlink fork service specs	Baldinof	2016-04-03	1	-2/+2
\| \| \|
\| * \|	Move unlink fork logic to a service	Baldinof	2016-03-22	2	-19/+32
\| \| \|
\| * \|	Merge branch 'master' into fix_remove_fork_link	Baldinof	2016-03-14	35	-458/+789
\| \|\ \
\| * \| \|	Close merge requests when removing fork relation	Baldinof	2016-03-11	1	-0/+19
\| \| \| \|
* \| \| \|	Merge branch 'update_repository_from_ee' into 'master'	Douwe Maan	2016-04-04	2	-4/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Repository#local_branches from gitlab-ee. REF: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/249 This will help us to avoid posible merge conflicts when merging gitlab-ce to gitlab-ee See merge request !3496
\| * \| \| \|	Migrate Repository#local_branches from gitlab-ee.update_repository_from_ee	Rubén Dávila	2016-04-01	2	-4/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will help us to avoid posible merge conflicts when merging gitlab-ce to gitlab-ee
* \| \| \| \|	Fix creation of merge requests for orphaned branches	Stan Hu	2016-04-04	2	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14875
* \| \| \| \|	Merge branch 'add-ability-to-archive-a-project-via-api-14296' into 'master'	Douwe Maan	2016-04-03	1	-0/+72
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add endpoints for archiving and unarchiving Closes #14296 See merge request !3372
\| * \| \| \|	Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296add-ability-to-archive-a-project-via-api-14296	Zeger-Jan van de Weg	2016-03-29	12	-54/+457
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296	Zeger-Jan van de Weg	2016-03-24	2	-27/+53
\| \|\ \ \ \ \
\| * \| \| \| \| \|	PUT becomes POST on archiving endpoints	Zeger-Jan van de Weg	2016-03-24	1	-29/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also the specs have a minor improvement. Mainly the access right spec. Changes are reflected in the docs
\| * \| \| \| \| \|	Add endpoints for archiving and unarchiving	Zeger-Jan van de Weg	2016-03-23	1	-0/+72
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'routing' into 'master'	Robert Speicher	2016-04-01	4	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added & use Gitlab::Routing for URL helpers Extracted from !3389 See merge request !3486
\| * \| \| \| \| \| \|	Added & use Gitlab::Routing for URL helpersrouting	Yorick Peterse	2016-04-01	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails' "url_helpers" method creates an anonymous Module (which a bunch of methods) on every call. By caching the output of this method in a dedicated method we can shave off about 10 seconds of loading time for an issue with around 200 comments.
* \| \| \| \| \| \| \|	Merge branch 'fix/fogbugz-import' into 'master'	Robert Speicher	2016-04-01	1	-0/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec and fix for fogbugz lonely user problem Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14766 I encountered this issue while manually testing all import types for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3066 This is really due to a horrible API ``` { 'people' => { 'person' => array_of_people_or_single_person_as_hash } } ``` See merge request !3457
\| * \| \| \| \| \| \| \|	updated specfix/fogbugz-import	James Lopez	2016-03-31	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	spec and fix for fogbugz lonely user problem	James Lopez	2016-03-30	1	-0/+24
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into ↵	Rémy Coutable	2016-04-01	1	-0/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Allow temp-oauth-email as notification email Closes #14559 /cc @dblessing @rymai See merge request !3477
\| * \| \| \| \| \| \| \| \|	Allow temp-oauth-email as notification emailerror-when-ldap-doesn-t-supply-an-email-address-14559	Zeger-Jan van de Weg	2016-03-31	1	-0/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2016-04-01	1	-8/+35
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	1	-8/+35
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, streamline the view. 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	1	-21/+56
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	1	-21/+56
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/issue-move-rewrite-uploads' into 'master'	Douwe Maan	2016-04-01	4	-4/+112
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into fix/issue-move-rewrite-uploads	Grzegorz Bizon	2016-03-31	14	-79/+345
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	1	-4/+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	2	-9/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Get FileUploader into test harness using factory	Grzegorz Bizon	2016-03-30	2	-4/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+68
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Remove "Congratulations!" tweet button on newly-created project.	connorshea	2016-03-31	1	-1/+0
\| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Exclude projects pending deletion from all results	Zeger-Jan van de Weg	2016-03-31	1	-0/+9
\| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-todos' into 'master'	Rémy Coutable	2016-03-31	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Destroy related todos when an Issue/MR is deleted Closes #14550 Closes #14598 See merge request !3376
\| * \| \| \| \| \| \| \| \| \|	Destroy related todos when an issue is deleted	Douglas Barbosa Alexandre	2016-03-30	1	-0/+1
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'reorder-project-expire-cache' into 'master'	Yorick Peterse	2016-03-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expire the exists cache before deletion to ensure project dir actually exists See merge request !3413
\| * \| \| \| \| \| \| \| \| \|	Expire the exists cache before deletion to ensure project dir actually exists	Stan Hu	2016-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14659
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'check-project-repo-exists' into 'master'	Yorick Peterse	2016-03-30	1	-0/+27
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check if repo exists before attempting to update cache info See merge request !3414