summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Handle raw_repository returning nil in exists?autocrlf-lazyYorick Peterse2016-02-182-0/+8
| | | | | | If path_with_namespace is nil Repository#raw_repository will also return nil. Apparently code out there creates a Repository instance without a namespace path. Right.
* Use Repository#exists? in Repository#commit?Yorick Peterse2016-02-181-1/+1
| | | | | Just checking raw_repository is no longer accurate to determine if a repository exists or not.
* Added specs for Repository#exists?Yorick Peterse2016-02-181-0/+13
|
* Fixed Repository#exists? to handle errorsYorick Peterse2016-02-181-6/+5
| | | | | | | | | | | | | Now that Repository#raw_repository no longer sets the autocrlf option it will also no longer raise any NoRepository errors since it doesn't access Rugged any more. This also means that Repository#exists? can't simply return the raw repository as this is no indication of whether or not the repository actually exists (besides returning a non boolean is weird in the first place). To solve this problem Repository#exists? now properly checks if the repository exists and returns true/false instead of a Gitlab::Git::Repository or nil object.
* Only set autocrlf when creating/updating filesYorick Peterse2016-02-182-5/+45
| | | | | | | | | | | | | Setting the "autocrlf" Git option is an overkill since it's rarely actually needed. More importantly, it has quite the impact on performance (see gitlab-org/gitlab-ce#13457 for more information). By setting "autocrlf" when creating or updating files we guarantee the option is always set properly when we actually need it _without_ introducing overhead for requests that have nothing to do with this option. Fixes gitlab-org/gitlab-ce#13457
* Merge branch 're-add-missing-part-in-update-doc' into 'master' Rémy Coutable2016-02-181-0/+26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-add section about NGINX config and init script updates in 8.4->8.5 update doc These sections were removed by !2766 but: - even if the NGINX config wasn't modified, it might be in future updates so it's better to always have it instead of having to remember to add it depending on the changes - the init script update section must be there since it's a safe command line that should be run on every update This fixes https://github.com/gitlabhq/gitlabhq/issues/10031. /cc @rspeicher @yorickpeterse See merge request !2815
| * Re-add section about NGINX config and init script updates in 8.4->8.5 update docre-add-missing-part-in-update-docRémy Coutable2016-02-151-0/+26
| | | | | | | | | | | | | | | | | | | | | | These sections were removed but: - even if the NGINX config wasn't modified, it might be in future updates so it's better to always have it instead of having to remember to add it depending on the changes - the init script update section must be there since it's a safe command line that should be run on every update [ci skip]
* | Merge branch 'fix/gitpushservice-complexity-issue' into 'master' Douwe Maan2016-02-183-90/+103
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce code complexity on GitPushService#execute Code complexity for gitlab-ce after this has been refactored: ``` 27.3: GitPushService#execute ``` This still needs to be merged into `gitlab-ee` presumably with conflicts... Perhaps we should create another issue for doing that? I left the code sort of similar to what it was... If I could, I would have refactored most of the code into separate classes, etc. as it breaks probably all SOLID principles. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13327 See merge request !2784
| * | refactored specJames Lopez2016-02-171-9/+12
| | |
| * | refactored some stuff based on MR feedbackJames Lopez2016-02-173-63/+34
| | |
| * | refactored GitPushService and updated specJames Lopez2016-02-153-53/+49
| | |
| * | typoJames Lopez2016-02-121-1/+1
| | |
| * | attempt to reduce code complexity on GitPushService#executeJames Lopez2016-02-113-80/+123
| | |
* | | Merge branch 'rs-update-unicorn' into 'master' Dmitriy Zaporozhets2016-02-182-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump unicorn to `~> 4.9.0` Closes #2820 See merge request !2843
| * | | Bump unicorn to `~> 4.9.0`rs-update-unicornRobert Speicher2016-02-162-3/+3
| | | |
* | | | Merge branch 'issue_13539' into 'master' Robert Speicher2016-02-182-1/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reopened MRs should also be considered as open. Fixes #13539 See merge request !2866
| * | | | Reopened MRs should also be considered as open.issue_13539Rubén Dávila2016-02-172-1/+35
| | | | |
* | | | | Merge branch 'sqlite_rm_rf' into 'master' Achilleas Pipinellis2016-02-171-1/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove remaining sqlite method call Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13535 See merge request !2862
| * | | | Remove remaining sqlite method callAchilleas Pipinellis2016-02-171-1/+0
| | | | |
* | | | | Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-1714-3/+247
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to see and sort on vote count from Issues and MR lists Fixes #3763 * Sort options ![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png) * Most popular ![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png) * Least popular ![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png) See merge request !2781
| * | | | | Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-1714-3/+247
| | | | | |
* | | | | | Merge branch 'git-archive-refactor' into 'master' Douwe Maan2016-02-1711-71/+77
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor 'git archive' hand-off to gitlab-workhorse We have a nicer way now to hand off HTTP responses to gitlab-workhorse. Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36 See merge request !2675
| * \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵git-archive-refactorJacob Vosmaer2016-02-1717-35/+149
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git-archive-refactor
| * | | | | | | Add newlineJacob Vosmaer2016-02-171-1/+1
| | | | | | | |
| * | | | | | | Use gitlab-workhorse 0.6.5Jacob Vosmaer2016-02-172-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-17345-2076/+5704
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | git-archive-refactor
| * | | | | | | | Fix APIJacob Vosmaer2016-02-114-6/+29
| | | | | | | | |
| * | | | | | | | First version of "git archive" headersJacob Vosmaer2016-02-027-66/+49
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRémy Coutable2016-02-1771-591/+1178
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bugfix/jschatz1/milestone-icon' into 'master' Rémy Coutable2016-02-171-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct icon for milestones. See merge request !2856
| | * | | | | | | | | Correct icon for milestones.bugfix/jschatz1/milestone-iconJacob Schatz2016-02-171-1/+1
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'fix/13464-order-line-notes-create_at-in-parallel-diff-view' ↵Douwe Maan2016-02-171-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Sort line notes used in parallel diff by created_at Fixes #13464. See merge request !2858
| | * | | | | | | | | Sort line notes used in parallel diff by created_atRémy Coutable2016-02-171-1/+1
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13464.
| * | | | | | | | | Merge branch 'fix/13367-redirect-to-project-page-if-no-import' into 'master' Douwe Maan2016-02-173-3/+25
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect /import to project page if no importing at all and repo exists Fixes gitlab-org/gitlab-ce#13367. See merge request !2857
| | * | | | | | | | Redirect /import to project page if no importing at all and repo existsfix/13367-redirect-to-project-page-if-no-importRémy Coutable2016-02-173-3/+25
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13367.
| * | | | | | | | Merge branch 'rs-issue-13469' into 'master' Douwe Maan2016-02-172-9/+14
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle nil commits in Gitlab::PushDataBuilder.build Closes #13469 See merge request !2825
| | * | | | | | | | Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469Robert Speicher2016-02-152-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13469
| * | | | | | | | | Merge branch 'expire-fork-import-caches' into 'master' Douwe Maan2016-02-177-1/+74
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire caches after forking/importing a repository cc @dblessing @DouweM Related issue: gitlab-org/gitlab-ce#13505 See merge request !2838
| | * | | | | | | | | Flush all repository caches when deleting a repoexpire-fork-import-cachesYorick Peterse2016-02-172-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that _all_ caches (including any caches normally only flushed under certain conditions) are flushed whenever a project is removed. Because cache keys are based on project namespaces (excluding IDs) not doing so could result in a newly created project re-using old caches (if the project was re-created using the same name).
| | * | | | | | | | | Expire caches after forking/importing a repositoryYorick Peterse2016-02-176-0/+52
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the caches for Repository#empty? and Repository#has_visible_content? are flushed after a repository has been imported or forked. Fixes gitlab-org/gitlab-ce#13505
| * | | | | | | | | Merge branch 'image-diff' into 'master' Douwe Maan2016-02-173-11/+18
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for showing images - Render scrubbed SVG's inline, not via /raw/ - Use /raw/ requests on image diffs Both of these are needed because of no longer eager loading blobs. This a follow-up to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2830 Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/13350 See merge request !2837
| | * | | | | | | | | Fixes requested by Rémyimage-diffJacob Vosmaer2016-02-172-4/+5
| | | | | | | | | | |
| | * | | | | | | | | No use to sanitize partial blob dataJacob Vosmaer2016-02-171-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Use /raw/ requests for image diffsJacob Vosmaer2016-02-161-9/+9
| | | | | | | | | | |
| | * | | | | | | | | Fix SVG blob renderingJacob Vosmaer2016-02-161-1/+7
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'fix/13517-impossible-subsequent-issuable-edits-in-sidebar' ↵Douwe Maan2016-02-172-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix a bug preventing from doing subsequent edits in any Issuable sidebar Fixes #13517. Fixes #12572. ### Issue ![impossible-subsequent-issue-edits-in-sidebar](/uploads/bd45c0effb46848641932d9cd38d3fe2/impossible-subsequent-issue-edits-in-sidebar.gif) --- ### Merge request ![impossible-subsequent-mr-edits-in-sidebar](/uploads/b4e1e3e93df4ac0a3d962df8b6139de9/impossible-subsequent-mr-edits-in-sidebar.gif) /cc @jschatz1 @sytses See merge request !2848
| | * | | | | | | | | | Fix a bug preventing from doing subsequent edits in any Issuable sidebarfix/13517-impossible-subsequent-issuable-edits-in-sidebarRémy Coutable2016-02-172-4/+4
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'klowner/gitlab-ce-fix-compare-by-tag-crash' into 'master' Douwe Maan2016-02-171-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when comparing by tags _Originally opened at !2787 by @klowner._ - - - Fixes #13171. Fixes #13370. See merge request !2849
| | * | | | | | | | | | Fix 500 error when comparing by tagsMark Riedesel2016-02-171-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'bugfix/jschatz1/sidebar/02-16-16' into 'master' Douwe Maan2016-02-171-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double scrollbar issues Sidebar double scrollbar issue fix. ![Screen_Shot_2016-02-16_at_9.22.49_PM](/uploads/cb950eda08ed5d3b4a6c6979c977e029/Screen_Shot_2016-02-16_at_9.22.49_PM.png) See merge request !2851
View Lorry Controller Status