Commit Graph

562 Commits

Author SHA1 Message Date
Robert Speicher 02b25598cb Merge branch 'bvl-add-all-settings-to-api' into 'master'
Add all ApplicationSettings attributes to the API

See merge request !12851
2017-07-27 23:55:23 +00:00
Oswaldo Ferreira f837cd6611 Use params#require instead params[] access 2017-07-27 12:09:46 -04:00
Oswaldo Ferreira e561b142fa Backport gitlab-ee!2456 2017-07-27 12:09:46 -04:00
Bob Van Landuyt ea1012ccb4 Make the attribute list for application settings reusable 2017-07-27 11:49:27 +02:00
Sean McGivern f2da36f196 Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' into 'master'
Fixes 500 error caused by pending delete projects in admin dashboard

Closes #35453

See merge request !13067
2017-07-26 08:29:38 +00:00
Tiago Botelho 22d53f0607 Fixes 500 error caused by pending delete projects in admin dashboard 2017-07-25 17:59:47 +01:00
Sean McGivern 2a067bb37c Merge branch 'backport-ee-2328' into 'master'
Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328

See merge request !13022
2017-07-25 11:27:58 +00:00
Maxim Rydkin fab1b0f1d1 Decrease ABC threshold to 56.96 2017-07-24 10:54:16 +00:00
Nick Thomas e4391c7190 Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328 2017-07-21 18:45:12 +01:00
Alexander Randa e0ab5618a0 Wrong data type when testing webhooks 2017-07-20 15:12:06 +00:00
Robin Bobbitt 672a68d372 Fixes needed when GitLab sign-in is not enabled
When sign-in is disabled:
 - skip password expiration checks
 - prevent password reset requests
 - don’t show Password tab in User Settings
 - don’t allow login with username/password for Git over HTTP requests
 - render 404 on requests to Profiles::PasswordsController
2017-07-13 10:08:27 -04:00
Rémy Coutable 040eeb1039
Allow to enable the Performance Bar for a group from the admin area
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-06 18:57:02 +02:00
Douwe Maan aa66e539f1 Merge branch '32408-enable-disable-all-restricted-visibility-levels' into 'master'
Resolve "Unable to disable all restricted visibility levels"

Closes #32408

See merge request !12649
2017-07-05 20:22:43 +00:00
Tiago Botelho 197a5df42a Allow admin to disable all restricted visibility levels 2017-07-05 19:20:52 +01:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
James Lopez efb3d5e70f fix spec failures 2017-06-23 19:00:22 +02:00
James Lopez b33c638483 update code based on feedback 2017-06-23 17:11:31 +02:00
James Lopez b804db2648 refactor update user service not to do auth checks 2017-06-23 11:41:43 +02:00
James Lopez e2e0b175ae fix specs 2017-06-23 11:41:43 +02:00
James Lopez 4c75fe5dfe add missing action to block 2017-06-23 11:41:42 +02:00
James Lopez c9fd3dc42c more refactoring based on feedback 2017-06-23 11:41:42 +02:00
James Lopez 785cbb79e2 refactor emails service 2017-06-23 11:41:42 +02:00
James Lopez 3bab585bec update to use emails destroy service 2017-06-23 11:41:42 +02:00
James Lopez bf3a3f3652 fix api and controller issues 2017-06-23 11:41:41 +02:00
James Lopez 36bc2e9016 fix specs 2017-06-23 11:41:41 +02:00
James Lopez aa158dd731 finish off refactoring users controller 2017-06-23 11:41:41 +02:00
James Lopez 85b5a8cfa6 update users controller 2017-06-23 11:41:41 +02:00
Robin Bobbitt e09ddc62b3 Help landing page customizations 2017-06-14 11:40:21 -04:00
Rémy Coutable ee0e3ffc05 Merge branch '3191-deploy-keys-update' into 'master'
Implement ability to update deploy keys

Closes #3191

See merge request !10383
2017-06-07 14:37:50 +00:00
Grzegorz Bizon 37dd19935b Merge branch 'instrument-infra' into 'master'
Add Prometheus metrics endpoint and basic infrastructure to meter code

See merge request !11553
2017-06-07 10:46:56 +00:00
blackst0ne a544e46bb0 Add a rubocop rule to check if a method 'redirect_to' is used without explicitly set 'status' in 'destroy' actions of controllers 2017-06-07 09:45:16 +11:00
Nick Thomas 5c602e306c Limit non-administrators to adding 100 members at a time to groups and projects 2017-06-06 16:04:26 +01:00
Nick Thomas f09b7f5607 Support hard deletion in Admin::UsersController#destroy 2017-06-05 17:48:57 +01:00
Sean McGivern 3b39cf4e0c Merge branch '30469-convdev-index' into 'master'
ConvDev Index

Closes #30469

See merge request !11377
2017-06-05 09:18:12 +00:00
Pawel Chojnacki c28546177e Prometheus settings 2017-06-02 19:45:57 +02:00
Alexander Randa 3d70eeb5bb Implement ability to update deploy keys 2017-06-02 19:44:36 +03:00
Cyril Jouve 1167a274c1
redirect to keys index instead of user index after a key is deleted
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-01 18:41:36 +02:00
Taurie Davis, Simon Knox and Adam Niedzielski 26dde5f55f Add Conversational Development Index page to admin panel 2017-06-01 17:37:21 +02:00
Lin Jen-Shin 70eb0c6a88 Merge remote-tracking branch 'upstream/master' into rename-builds-controller
* upstream/master: (307 commits)
  Address feedback
  Add small update for the i18n guide.
  update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error
  update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin
  name all webpack chunks to improve long term cacheability
  add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin
  upgrade to latest webpack version
  Only use DROP INDEX CONCURRENTLY on postgreql 9.2+
  Provide default for calculating label text color (!11681)
  Add failing test for #32728
  Bugfix: Always use the default language when generating emails.
  Remove unecessary commit pattern check
  Add regexp_for_value helper method
  Remove shared example and improve sub_group_issuables_spec.rb
  Remove 'should' from scenario in has_subgroup_title_spec.rb
  Cartfile git and binary methods cannot take a GitHub repo
  Fix terminals support for Kubernetes service
  Add review comments to compare_spec.rb
  Fix transient error clicking dropdown items in compare_spec.rb
  Use non-global jQuery reference within raven bundle
  ...
2017-05-26 18:25:32 +08:00
Alexander Randa 330789c23c Implement web hooks logging
* implemented logging of project and system web hooks
* implemented UI for user area (project hooks)
* implemented UI for admin area (system hooks)
* implemented retry of logged webhook
* NOT imeplemented log remover
2017-05-25 10:07:52 +03:00
Lin Jen-Shin 71777a4a18 Rename BuildsController to JobsController
Rename other URL generators

admin_builds_path -> admin_jobs_path

Fix tests and more renaming

Fix more tests

Also change build_id to job_id in the controller
2017-05-17 20:17:30 +08:00
Gabriel Mazetto 2e97db051c Make the new repository_update_events configurable in System Hooks UI 2017-05-12 23:26:48 +01:00
Sean McGivern 143d88d5e6 Merge branch 'fix/admin-integrations' into 'master'
Fix new admin integrations not taking effect on existing project

Closes #26376

See merge request !11069
2017-05-05 22:01:43 +00:00
James Lopez f15466bd5b refactor code based on feedback 2017-05-05 18:18:39 +02:00
James Lopez 6ecf16b8f7 refactor code based on feedback 2017-05-05 18:01:33 +02:00
James Lopez cf002738e7 refactor a few things based on feedback 2017-05-04 18:11:28 +02:00
James Lopez 264bf22927 add propagate service worker and updated spec and controller 2017-05-03 17:20:12 +02:00
Luke "Jared" Bennett 7788118c3d
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue 2017-05-03 13:03:57 +01:00
Luke "Jared" Bennett 284d4f76fe
Attempted adding separate clientside_sentry settings 2017-04-28 13:41:29 +01:00
Alexander Randa c504b88f07 Implement ability to update hooks 2017-04-28 11:49:57 +00:00