Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reload forked_project_link projects | Yorick Peterse | 2016-04-04 | 1 | -0/+5 |
* | Merge branch 'fix_remove_fork_link' into 'master' | Douwe Maan | 2016-04-04 | 1 | -0/+32 |
|\ | |||||
| * | 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.update_repository_from_ee | Rubén Dávila | 2016-04-01 | 2 | -4/+23 |
* | | | | Fix creation of merge requests for orphaned branches | Stan Hu | 2016-04-04 | 2 | -0/+29 |
* | | | | Merge branch 'add-ability-to-archive-a-project-via-api-14296' into 'master' | Douwe Maan | 2016-04-03 | 1 | -0/+72 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | 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 |
| * | | | | | 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 helpersrouting | Yorick Peterse | 2016-04-01 | 4 | -4/+4 |
* | | | | | | | Merge branch 'fix/fogbugz-import' into 'master' | Robert Speicher | 2016-04-01 | 1 | -0/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 'ma... | Rémy Coutable | 2016-04-01 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 'snippets-with-comments-cause-a-500-when-they-show-up-in-search-... | Douwe Maan | 2016-04-01 | 1 | -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-14764 | Rémy Coutable | 2016-03-31 | 1 | -8/+35 |
* | | | | | | | | | | Merge branch 'fix-mentions-on-confidential-issues-for-non-members' into 'mast... | Douwe Maan | 2016-04-01 | 1 | -21/+56 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | 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 |
| * | | | | | | | | | | | 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 |
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | 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 | 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 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 | Stan Hu | 2016-03-27 | 1 | -1/+1 |
* | | | | | | | | | | | 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 | Stan Hu | 2016-03-27 | 1 | -0/+27 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'cleanup-system-hook-spec' into 'master' | Robert Speicher | 2016-03-30 | 1 | -27/+27 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | minor cleanup in system_hook_spec | Zeger-Jan van de Weg | 2016-03-30 | 1 | -27/+27 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'precompile-emoji-urls' into 'master' | Dmitriy Zaporozhets | 2016-03-30 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Pre-calculate Emoji digestsprecompile-emoji-urls | Yorick Peterse | 2016-03-30 | 1 | -0/+19 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'tests/isolate-carrierwave-uploads' into 'master' | Robert Speicher | 2016-03-30 | 2 | -0/+11 |
|\ \ \ \ \ \ \ \ \ |