diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-16 03:22:55 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-16 03:22:55 -0800 |
| commit | d46dba58302a2e4aa55991f88b302dd6c15539dd (patch) | |
| tree | 5381dca56bd5d2512264321440a2a852c840734a /lib | |
| parent | 4227f6ed145bdc884cf92b0c29714abc9331d702 (diff) | |
| parent | d89527839ea0dd1734dacb71c3ed2a97f1ff74d7 (diff) | |
| download | gitlab-ce-d46dba58302a2e4aa55991f88b302dd6c15539dd.tar.gz | |
Merge pull request #5847 from skv-headless/fix_deprecation_warnings
fix most of warnings
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/namespaces.rb | 2 | ||||
| -rw-r--r-- | lib/api/users.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/namespaces.rb b/lib/api/namespaces.rb index 3a9ab66957e..f9f2ed90ccc 100644 --- a/lib/api/namespaces.rb +++ b/lib/api/namespaces.rb @@ -12,7 +12,7 @@ module API # Example Request: # GET /namespaces get do - @namespaces = Namespace.scoped + @namespaces = Namespace.all @namespaces = @namespaces.search(params[:search]) if params[:search].present? @namespaces = paginate @namespaces diff --git a/lib/api/users.rb b/lib/api/users.rb index 54d3aeecb70..475343a3edf 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -9,7 +9,7 @@ module API # Example Request: # GET /users get do - @users = User.scoped + @users = User.all @users = @users.active if params[:active].present? @users = @users.search(params[:search]) if params[:search].present? @users = paginate @users |