summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Handle raw_repository returning nil in exists?autocrlf-lazyYorick Peterse2016-02-181-0/+2
| | | | | | 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.
* 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-181-3/+7
| | | | | | | | | | | | | 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 'fix/gitpushservice-complexity-issue' into 'master' Douwe Maan2016-02-182-58/+62
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 some stuff based on MR feedbackJames Lopez2016-02-172-9/+4
| |
| * refactored GitPushService and updated specJames Lopez2016-02-152-29/+25
| |
| * typoJames Lopez2016-02-121-1/+1
| |
| * attempt to reduce code complexity on GitPushService#executeJames Lopez2016-02-112-54/+67
| |
* | Reopened MRs should also be considered as open.issue_13539Rubén Dávila2016-02-171-1/+1
| |
* | Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-177-3/+88
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-177-3/+88
| | |
* | | Merge branch 'git-archive-refactor' into 'master' Douwe Maan2016-02-172-24/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1712-26/+93
| |\ \ \ | | | | | | | | | | | | | | | git-archive-refactor
| * \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-17181-981/+1795
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git-archive-refactor
| * | | | | First version of "git archive" headersJacob Vosmaer2016-02-022-24/+3
| | | | | |
* | | | | | 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-172-3/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-172-3/+13
| |/ / / / | | | | | | | | | | | | | | | Fixes #13367.
* | | | | Merge branch 'expire-fork-import-caches' into 'master' Douwe Maan2016-02-174-1/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-173-0/+10
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | |
* | | | | | | Fix double scrollbar issuesJacob Schatz2016-02-171-0/+16
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'issue_13359' into 'master' Jacob Schatz2016-02-172-10/+21
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents floated button group on issues view Issue #13359 ![screenshot](/uploads/962ac4f3f1f3d6ef87f7152c09090801/screenshot.jpg) See merge request !2826
| * | | | | Wrap issue details to prevent content misalignmentissue_13359Alfredo Sumaran2016-02-162-9/+16
| | | | | |
| * | | | | Change "opened by" to just "by"Alfredo Sumaran2016-02-161-1/+1
| | | | | |
| * | | | | Prevent author name to split into multiple linesAlfredo Sumaran2016-02-151-1/+1
| | | | | |
| * | | | | Prevent split time into multiple lines for better readingAlfredo Sumaran2016-02-151-0/+4
| | | | | |
| * | | | | Move issue details after action buttonsAlfredo Sumaran2016-02-151-10/+10
| | | | | |
* | | | | | Merge branch 'bugfix/jschatz1/sidebar-fixes-13215' into 'master' Jacob Schatz2016-02-162-1/+26
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidebar fixes Fixes #13215 * when editing a dropdown, but not changing anything you end up in an ugly state * the hover-over state for the subscribe and other buttons are veeery subtle * the collapse button needs some sort of hover-over state * the reference gets shortened. It always got shortened. Not an issue with this in particular. * the minimized sidebar is not functional. The copy button doesn't do anything * looks all funky in safari (not for me) See merge request !2736
| * | | | | Make copy button in collapsed sidebar work.bugfix/jschatz1/sidebar-fixes-13215Jacob Schatz2016-02-052-1/+14
| | | | | |
| * | | | | Fix span margin issuesJacob Schatz2016-02-051-1/+5
| | | | | |
| * | | | | Add hover for gutter toggle buttonJacob Schatz2016-02-051-5/+8
| | | | | |
| * | | | | Change hover color of sidebar buttonsJacob Schatz2016-02-051-0/+5
| | | | | |
| * | | | | Fix ugly state of dropdownJacob Schatz2016-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when editing a dropdown, but not changing anything you end up in an ugly state Fixes #13215
* | | | | | Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan2016-02-163-11/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new data to project in push, issue, merge-request and note webhooks data _Originally opened at !2738 by @bugagazavr._ - - - **What does this MR do?** Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks ) **Are there points in the code the reviewer needs to double check?** 1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738 2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132 3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52 4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56 **Why was this MR needed?** More information about user for push events, and more data about repositiry ( project ) **What are the relevant issue numbers?** No **Screenshots (if relevant)** No See merge request !2788
| * | | | | | Use project.web_url instead deprecated repository.homepage in PushoverServiceRémy Coutable2016-02-161-1/+1
| | | | | | |
| * | | | | | Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-112-10/+16
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead