Commit Graph

501 Commits

Author SHA1 Message Date
Douwe Maan 514dc1a084 Merge branch 'feature/enforce-2fa-per-group' into 'master'
Support 2FA requirement per-group

See merge request !8763
2017-04-06 15:50:16 +00:00
Markus Koller a3430f011f Support 2FA requirement per-group 2017-04-06 10:01:13 +02:00
Jacopo b996a82ff4 ProjectsFinder should handle more options
Extended ProjectFinder in order to handle the following options:
 - current_user - which user use
 - project_ids_relation: int[] - project ids to use
 - params:
   -  trending: boolean
   -  non_public: boolean
   -  starred: boolean
   -  sort: string
   -  visibility_level: int
   -  tags: string[]
   -  personal: boolean
   -  search: string
   -  non_archived: boolean

GroupProjectsFinder now inherits from ProjectsFinder.
Changed the code in order to use the new available options.
2017-04-06 07:11:37 +02:00
Sean McGivern 872b3215d2 Merge branch 'introduce-base-polling-interval' into 'master'
Introduce "polling_interval_multiplier" as application setting

Closes #29759

See merge request !10280
2017-04-03 14:51:37 +00:00
Adam Niedzielski 9543025e88 Introduce "polling_interval_multiplier" as application setting
Implement module for setting "Poll-Interval" response header.
Return 429 in ETag caching middleware when polling is disabled.
2017-04-03 15:17:04 +02:00
Stan Hu 38a108cac9 Fix a few N+1 queries identified by Bullet
See !10263
2017-04-02 05:42:11 -07:00
Sebastian Reitenbach fd097fa9e1 Handle parsing OpenBSD ps output properly to display sidekiq
infos on admin->monitoring->background
2017-03-31 09:45:46 +02:00
Sean McGivern 5b84708df2 Merge branch 'tc-cleanup-application-settings-spec' into 'master'
Cleanup application settings spec

See merge request !10189
2017-03-30 12:05:00 +00:00
Rémy Coutable b351a77a52 Merge branch 'fix_rake_gitlab_check_sidekiq' into 'master'
Make bundle exec rake gitlab:check RAILS_ENV=production

Closes #30084

See merge request !10246
2017-03-29 17:16:13 +00:00
Dongqing Hu 6dd7695444 Labels support color names in backend 2017-03-29 11:45:15 +00:00
Sebastian Reitenbach d8569440b5 There might be ps utilities out there, that assume 80chars instead
of unlimited width if they cannot detect terminal size, therefore
force unlimited terminal size when checking processes via ps.
2017-03-28 23:15:17 +02:00
George Andrinopoulos 7c74a0209b Implement new service for creating user 2017-03-27 09:37:24 +00:00
Toon Claes 5058fc67ac Remove redundant code to convert restricted_levels to integers
The ApplicationSetting#restricted_visibility_levels= now takes care of
converting string formatted levels to integers.
2017-03-23 15:25:42 +01:00
http://jneen.net/ 66f204e0f0 get the logic right :X 2017-03-09 12:02:56 -08:00
http://jneen.net/ b88314f4ad consolidate the error handling for #impersonate 2017-03-09 11:50:11 -08:00
http://jneen.net/ dfe41c1556 protect internal users from impersonation 2017-03-09 11:49:52 -08:00
Sean McGivern 8549f7aa1e Fix access token specs
de37dcee90 was a manual merge, which meant
it didn't have a build, so I broke master :-(
2017-03-07 18:12:52 +00:00
Sean McGivern de37dcee90 Merge branch 'siemens/gitlab-ce-feature/openid-connect' 2017-03-07 16:16:08 +00:00
Douwe Maan 6a52cda31d Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonation_token' 2017-03-07 09:29:55 -06:00
Markus Koller 789db2cc19 Make sure scopes are loaded in admin OAuth application form 2017-03-07 14:54:36 +01:00
Tiago Botelho 005749a616 apply codestyle and implementation changes to the respective feature code 2017-03-06 19:18:26 +00:00
Pawel Chojnacki 80fbced2e0 Add admin settings entries 2017-03-06 15:41:25 +01:00
Dmitriy Zaporozhets 2d006b4638 Merge branch 'dashboard-filter-search-keep-params' into 'master'
Fixes filtering by name reseting archive filter

Closes #28007

See merge request !9625
2017-03-04 15:18:08 +00:00
Douglas Barbosa Alexandre 0fcb8ce7d6 Bump health_check gem to version 2.6.0 2017-03-03 16:35:20 -03:00
Dmitriy Zaporozhets 5bb6a85b90
Refactor projects filtering by name
Reuse same search form and behavior for dashboard#projects, group#projects
and admin#projects. Repsect all other options like sorting, personal
filter when search projects by name. Create FilterableList JS class to
handle identical behaviour of projects and groups lists.

This change also makes filtering and sorting availabe on explore#projects
and explore#groups no matter if you are logged in or not.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-03-03 18:39:30 +02:00
Tiago Botelho 2b474dc2b2 refactors finder and correlated code 2017-03-01 13:11:11 +00:00
Tiago Botelho 9f2e4742e3 applies relevant changes to the code and code structure 2017-02-28 22:15:40 +00:00
Tiago Botelho f0ea7130f7 refactors documentation and personal access tokens form to not allow admins to generate non impersionation tokens 2017-02-28 22:15:40 +00:00
Simon Vocella c2b1cdef7e add admin panel for personal access tokens 2017-02-28 22:15:39 +00:00
Lin Jen-Shin 83418ad846 Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration
* upstream/master: (247 commits)
  Switched CONTRIBUTING.md style guide recommendation for method chaining
  Fix new offenses
  Stylistic tweaks
  Fix OAuth/SAML user blocking behavior
  Revert "Enable Style/DotPosition"
  Revert "Prefer leading style for Style/DotPosition"
  Revert "Enable Style/BarePercentLiterals"
  Manually correct autocorrect
  Move up delegate calls
  Exclude migrations from Style/MutableConstant
  ActiveSupport delegation is preferred over Forwardable
  Update haml_lint to work with newest rubocop
  Add explanations to cops
  Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml
  Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml
  Order cops alphabetically
  Don’t exclude some file in lib from rubocop
  Fix new offenses
  Enable Rails/Delegate
  Enable Style/WordArray
  ...
2017-02-24 17:14:35 +08:00
Douwe Maan 56de781a2c Revert "Enable Style/DotPosition"
This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.

# Conflicts:
#	.rubocop.yml
#	.rubocop_todo.yml
#	lib/gitlab/ci/config/entry/global.rb
#	lib/gitlab/ci/config/entry/jobs.rb
#	spec/lib/gitlab/ci/config/entry/factory_spec.rb
#	spec/lib/gitlab/ci/config/entry/global_spec.rb
#	spec/lib/gitlab/ci/config/entry/job_spec.rb
#	spec/lib/gitlab/ci/status/build/factory_spec.rb
#	spec/lib/gitlab/incoming_email_spec.rb
2017-02-23 09:33:19 -06:00
Douwe Maan 1fe7501b49 Revert "Prefer leading style for Style/DotPosition"
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
2017-02-23 09:33:05 -06:00
Douwe Maan 206953a430 Prefer leading style for Style/DotPosition 2017-02-23 09:32:22 -06:00
Douwe Maan b7d8df503c Enable Style/MutableConstant 2017-02-23 09:31:56 -06:00
Douwe Maan 3dadf306dd Enable Style/DotPosition 2017-02-23 09:31:56 -06:00
Lin Jen-Shin a538b0da9b Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration
* upstream/master: (234 commits)
  Improve performance of User Agent Detail
  Fix some grammar in the API docs
  Remove shared example for pagination
  API: Use POST to (un)block a user
  API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`
  Use grape validation for dates
  Change wording for LDAP doc that was moved to a new location
  API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`
  Download snippets with LF line-endings by default
  utilize pre-minified Vue in production since no CJS distribution is available
  Prevent project team from being truncated too early during project destruction
  loading icon sometimes toggled alongside MR pipeline contents
  fix failed spec because haml_lint
  fix incorrect sidekiq concurrency count in admin background page
  exclude rpc_pipefs from system disc info
  Fix wrong line ending [ci-skip]
  fix overlooked window binding in spec files
  remove imports loader
  replace implicit this == window with explicit binding
  Todo done clicking is kind of unusable.
  ...
2017-02-21 02:14:31 +08:00
Rémy Coutable dc303fe2db Merge branch 'fix_sidekiq_concurrency_warning_message_in_admin_background_job_page' into 'master'
fix incorrect sidekiq concurrency count in admin background page

Closes #19862

See merge request !9359
2017-02-20 11:22:13 +00:00
wendy0402 a29fbc213c fix incorrect sidekiq concurrency count in admin background page 2017-02-19 15:15:30 +07:00
Ben Bodenmiller d3afb75238 exclude rpc_pipefs from system disc info 2017-02-18 09:39:49 +00:00
Kamil Trzciński f662bc5a86 Merge branch 'use-update-runner-service' into 'master'
Prefer service object over after_save hook

Closes #26921

See merge request !8664
2017-02-17 13:03:12 +00:00
Annabel Dunstone Gray 0667d1aa7f Drop theme ID from users table 2017-02-15 13:31:18 -06:00
Lin Jen-Shin a065ee341c Merge remote-tracking branch 'upstream/master' into use-update-runner-service
* upstream/master: (488 commits)
  Remove duplicate CHANGELOG.md entries for 8.16.5
  Update CHANGELOG.md for 8.14.9
  Update CHANGELOG.md for 8.15.6
  #27631: Add missing top-area div to activity header page
  Update CHANGELOG.md for 8.16.5
  Update CHANGELOG.md for 8.16.5
  Update CHANGELOG.md for 8.16.5
  Fix yarn lock and package.json mismatch caused by MR 9133
  sync yarn.lock with recent changes to package.json
  Add changelog
  Fix z index bugs
  Add Links to Branches in Calendar Activity
  SidekiqStatus need to be qualified in some cases
  Replace static fixture for behaviors/requires_input_spec.js (!9162)
  API: Consolidate /projects endpoint
  Add MySQL info in install requirements
  Fix timezone on issue boards due date
  Use Gitlab::Database.with_connection_pool from !9192
  Disconnect the pool after done
  Use threads directly, introduce pool later:
  ...
2017-02-15 16:13:14 +08:00
Lin Jen-Shin 53c94f9ea2 Use the same syntax for default expiration
Feedback:

* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23343951
* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23344036
* https://gitlab.com/gitlab-org/gitlab-ce/issues/27762#note_23344797
2017-02-15 15:31:51 +08:00
Lin Jen-Shin d2d30cff55 Initial implementation for default artifacts expiration
TODO: Add tests and screenshots
2017-02-15 15:31:51 +08:00
Dmitriy Zaporozhets 8820f3cdd2 Merge branch 'dz-refactor-full-path' into 'master'
Store group and project full name and full path in routes table

See merge request !8979
2017-02-08 18:45:19 +00:00
Dmitriy Zaporozhets 2989192d1a
Store group and project full name and full path in routes table
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-02-08 19:14:29 +02:00
dixpac 0dacf3c169 Fix inconsistent naming for services that delete things
* Changed name of delete_user_service and worker to destroy
* Move and change delete_group_service to Groups::DestroyService
* Rename Notes::DeleteService to Notes::DestroyService
2017-02-08 09:16:43 +01:00
Douwe Maan 50f5960c72 Merge branch 'ee-1439-read-only-user' into 'master'
Backport changes from gitlab-org/gitlab-ee!998

See merge request !8984
2017-02-07 04:10:13 +00:00
Jose Ivan Vargas 426680def4 Backport of the frontend view, including tests 2017-02-06 16:17:46 -06:00
Lin Jen-Shin 11e7573657 Merge remote-tracking branch 'upstream/master' into use-update-runner-service
* upstream/master: (379 commits)
  Fixed failing tests because list doens't exist
  Add changelog file
  Update system_note_service_spec.rb
  Remove noteable object in time tracking system notes [ci-skip]
  Make all system notes lowercase
  Fixed eslint
  Don't render snippet actions for logged-out users
  Remove deprecated MR and Issue endpoints and preserve V3 namespace
  Removed additional dropdown list animations
  Improve docs on CI/CD code coverage regexp setting
  Improve Changelog entry for CI config compatibility fix
  Refine docs on code coverage regexp on job level
  Introduce maximum session time for terminal websocket connection
  Add Changelog entry for CI config compatibility fix
  Map configuration to directory locations and add defaults to NFS HA doc.
  Update docs on setting up a CI/CD coverage regexp
  Fix Rubocop offense in legacy CI/CD config specs
  add CHANGELOG entry for !8988
  transpile all javascript files with babel
  add npm run webpack command
  ...
2017-02-07 02:49:03 +08:00