summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/permissions-when-importing-members' into 'master' Douwe Maan2016-04-051-0/+49
|\
| * Respond 404 when unauthorized user imports membersfix/permissions-when-importing-membersGrzegorz Bizon2016-04-051-2/+2
| * Do not leak project exists when importing membersGrzegorz Bizon2016-04-051-2/+2
| * Check permissions when importing project membersGrzegorz Bizon2016-04-051-0/+49
* | Merge branch 'reorder-language' into 'master' Yorick Peterse2016-04-051-4/+14
|\ \ | |/ |/|
| * Update language only on HEAD of the repositoryreorder-languageKamil Trzcinski2016-04-051-4/+14
* | Merge branch 'fix-gh-pr-import' into 'master' Yorick Peterse2016-04-052-0/+31
|\ \
| * | Flush repository cache before import project datafix-gh-pr-importDouglas Barbosa Alexandre2016-04-042-0/+31
* | | Wrap images in discussions and wikis with a link to the image source using Im...connorshea2016-04-042-1/+25
|/ /
* | Reload forked_project_link projectsYorick Peterse2016-04-041-0/+5
* | Merge branch 'fix_remove_fork_link' into 'master' Douwe Maan2016-04-041-0/+32
|\ \
| * | Fix rubocop in unlink fork service specsBaldinof2016-04-031-2/+2
| * | Move unlink fork logic to a serviceBaldinof2016-03-222-19/+32
| * | Merge branch 'master' into fix_remove_fork_linkBaldinof2016-03-1435-458/+789
| |\ \
| * | | Close merge requests when removing fork relationBaldinof2016-03-111-0/+19
* | | | Merge branch 'update_repository_from_ee' into 'master' Douwe Maan2016-04-042-4/+23
|\ \ \ \
| * | | | Migrate Repository#local_branches from gitlab-ee.update_repository_from_eeRubén Dávila2016-04-012-4/+23
* | | | | Fix creation of merge requests for orphaned branchesStan Hu2016-04-042-0/+29
* | | | | Merge branch 'add-ability-to-archive-a-project-via-api-14296' into 'master' Douwe Maan2016-04-031-0/+72
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296add-ability-to-archive-a-project-via-api-14296Zeger-Jan van de Weg2016-03-2912-54/+457
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296Zeger-Jan van de Weg2016-03-242-27/+53
| |\ \ \ \ \
| * | | | | | PUT becomes POST on archiving endpointsZeger-Jan van de Weg2016-03-241-29/+29
| * | | | | | Add endpoints for archiving and unarchivingZeger-Jan van de Weg2016-03-231-0/+72
* | | | | | | Merge branch 'routing' into 'master' Robert Speicher2016-04-014-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Added & use Gitlab::Routing for URL helpersroutingYorick Peterse2016-04-014-4/+4
* | | | | | | | Merge branch 'fix/fogbugz-import' into 'master' Robert Speicher2016-04-011-0/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | updated specfix/fogbugz-importJames Lopez2016-03-311-1/+1
| * | | | | | | | spec and fix for fogbugz lonely user problemJames Lopez2016-03-301-0/+24
* | | | | | | | | Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into 'ma...Rémy Coutable2016-04-011-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow temp-oauth-email as notification emailerror-when-ldap-doesn-t-supply-an-email-address-14559Zeger-Jan van de Weg2016-03-311-0/+7
* | | | | | | | | | Merge branch 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-...Douwe Maan2016-04-011-8/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix view of notes in search results when noteable is a snippetsnippets-with-comments-cause-a-500-when-they-show-up-in-search-results-14764Rémy Coutable2016-03-311-8/+35
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into 'mast...Douwe Maan2016-04-011-21/+56
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Mentions on confidential issues doesn't create todos for non-membersfix-mentions-on-confidential-issues-for-non-membersDouglas Barbosa Alexandre2016-03-301-21/+56
* | | | | | | | | | | Merge branch 'fix/issue-move-rewrite-uploads' into 'master' Douwe Maan2016-04-014-4/+112
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix rubocop offenses in upload rewriter specsfix/issue-move-rewrite-uploadsGrzegorz Bizon2016-03-311-1/+1
| * | | | | | | | | | | Merge branch 'master' into fix/issue-move-rewrite-uploadsGrzegorz Bizon2016-03-3114-79/+345
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Improve specs for issue move serviceGrzegorz Bizon2016-03-311-2/+2
| * | | | | | | | | | | Extend specs for GFM uploads rewriterGrzegorz Bizon2016-03-312-11/+32
| * | | | | | | | | | | Remove reduntant `move_to_store` overrideGrzegorz Bizon2016-03-301-4/+4
| * | | | | | | | | | | Add support for not Active Record based factoriesGrzegorz Bizon2016-03-301-4/+12
| * | | | | | | | | | | Refactor uploads rewriter used when moving issueGrzegorz Bizon2016-03-302-9/+4
| * | | | | | | | | | | Get FileUploader into test harness using factoryGrzegorz Bizon2016-03-302-4/+20
| * | | | | | | | | | | Add uploads rewriter and use it when moving issueGrzegorz Bizon2016-03-302-0/+68
* | | | | | | | | | | | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-1/+0
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'clean-up-user-controller-spec' into 'master' Robert Speicher2016-03-311-12/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Minor clean up on admin/users_controller_specZeger-Jan van de Weg2016-03-311-12/+3
* | | | | | | | | | | | Exclude projects pending deletion from all resultsZeger-Jan van de Weg2016-03-311-0/+9
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-todos' into 'master' Rémy Coutable2016-03-311-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Destroy related todos when an issue is deletedDouglas Barbosa Alexandre2016-03-301-0/+1
| | |/ / / / / / / / | |/| | | | | | | |