summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blobRobert Speicher2016-02-186-17/+118
| | | | | | | | | | | 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.
* Merge branch 'patch-1' into 'master' Robert Speicher2016-02-181-1/+1
|\ | | | | | | | | | | | | | | | | Bug found by Charles Sibbald at Sky. Calls with patricio and Jacob confirmed this. [ci skip] See merge request !2877
| * bug found by Charles Sibbald at Sky . Calls with patricio and Jacob ↵Richard Pidgeon2016-02-181-1/+1
| | | | | | | | confirmed this
* | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-181-21/+0
|\ \ | | | | | | | | | | | | | | | | | | No changes to nginx config in this update. Removed unnecessary instructions. [ci skip] See merge request !2879
| * | No changes to nginx config in this update. Removed unnecessary instructions.Brandon Patton2016-02-181-21/+0
| | |
* | | Merge branch 'revert-2782' into 'master' Douwe Maan2016-02-188-378/+27
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'saml-decoupling' into 'master'" This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9. Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2782 See merge request !2878
| * | Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-188-378/+27
|/ / | | | | | | | | This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
* | Merge branch 'rs-sentry-release-tracking' into 'master' Douwe Maan2016-02-182-2/+3
|\ \ | | | | | | | | | | | | | | | | | | Add release tracking for Sentry See merge request !2863
| * | Add release tracking for Sentryrs-sentry-release-trackingRobert Speicher2016-02-172-2/+3
| | |
* | | Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-188-27/+378
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-188-27/+378
| | |/ | |/|
* | | Merge branch 'cache-clear' into 'master' Robert Speicher2016-02-182-5/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use SCAN during 'rake cache:clear' This allows 'rake cache:clear' to delete millions of keys without choking. It requires Redis 2.8.0 or newer but we needed that already anyway. See merge request !2872
| * \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-1864-208/+777
| |\ \ \ | | |/ / | | | | | | | | cache-clear
| * | | Use SCAN during 'rake cache:clear'cache-clearJacob Vosmaer2016-02-182-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | This allows 'rake cache:clear' to delete millions of keys without choking. It requires Redis 2.8.0 or newer but we needed that already anyway.
* | | | Merge branch 'autocrlf-lazy' into 'master' Robert Speicher2016-02-182-11/+71
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 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-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 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master' Dmitriy Zaporozhets2016-02-182-16/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses cross browser niceScroll to do scrolling on sidebar. Fixes: #13544 Firefox does not support `-webkit-scrollbar` and there is no alternative for FF. So for example Gmail falls back to no fancy scrollbar. Stuck with jQuery, which is a good solution, since we already use it. This also leaves the default scrollbar as is. ![Screen_Shot_2016-02-18_at_11.02.26_AM](/uploads/1184f06b71a8d9097ef1e3450a0c0ab3/Screen_Shot_2016-02-18_at_11.02.26_AM.png) Also fixes horz scroll issue: ![Screen_Shot_2016-02-18_at_11.09.56_AM](/uploads/63e9a8e824cac69a2745dd4dd84d1dfb/Screen_Shot_2016-02-18_at_11.09.56_AM.png) cc @creamzy @dzaporozhets See merge request !2873
| * | | | 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-187-3/+117
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add specs covering bug in build allowed to fail caseGrzegorz Bizon2016-02-181-0/+29
| | | | |
| * | | | Add Changelog entry for builds scheduler fixfix/ci-first-job-allow-failureGrzegorz Bizon2016-02-181-0/+1
| | | | |
| * | | | Fix builds scheduler when first build is allowed to failGrzegorz Bizon2016-02-183-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix when there was only one relevant, previous build and it failed, but was allowed to fail, entire build had been marked as skipped. Closes #3192
| * | | | Add specs for build status helper classGrzegorz Bizon2016-02-183-3/+36
| | | | |
| * | | | Return a builds array in builds create serviceGrzegorz Bizon2016-02-182-0/+21
| | | | |
* | | | | 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 'patch-1' into 'master' Kamil Trzciński2016-02-181-2/+24
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add example of creating build artifacts only for release tags. See merge request !2649
| * | | | | Grammar cleanup in yaml/README.mdMart Somermaa2016-02-031-2/+2
| | | | | |
| * | | | | Add example of creating build artifacts only for release tags.Mart Sõmermaa2016-02-031-0/+22
| | | | | |
* | | | | | 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
View Lorry Controller Status