summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blobRobert Speicher2016-02-185-17/+37
| | | | | | | | | | | This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG.
* Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-181-36/+18
| | | | | This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
* Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-181-18/+36
|\ | | | | | | | | | | | | | | | | Decouple SAML authentication from the default Omniauth logic Fixes gitlab-org/gitlab-ee#178 With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118 See merge request !2782
| * Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-181-18/+36
| |
* | Merge branch 'autocrlf-lazy' into 'master' Robert Speicher2016-02-181-9/+14
|\ \ | |/ |/| | | | | | | | | | | Only set autocrlf when creating/updating files Related issue: gitlab-org/gitlab-ce#13457 Details: 5619a6de1dd6fc1dfd4053810c7b11c677b7a495 See merge request !2859
| * 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
* | Uses cross browser niceScroll to do scrolling on sidebar.Jacob Schatz2016-02-182-16/+2
| |
* | Merge branch 'fix/ci-first-job-allow-failure' into 'master' Kamil Trzciński2016-02-181-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix CI builds scheduler when first build in stage is allowed to fail This fixes an edge case in CI builds scheduler when first build in stage was marked as allowed to fail. Closes #3192 See merge request !2869
| * | Return a builds array in builds create serviceGrzegorz Bizon2016-02-181-0/+1
| | |
* | | Merge branch 'rs-git-fetch-labels' into 'master' Kamil Trzciński2016-02-181-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Fix labels for git clone/git fetch Project CI setting See merge request !2842
| * | Fix labels for git clone/git fetch Project CI settingrs-git-fetch-labelsRobert Speicher2016-02-161-2/+2
| | |
* | | 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
| | | | | |
View Lorry Controller Status