8e9c073a14
Merge branch 'feature/merge-request-system-hook' into 'master'
...
System hooks for Merge Requests
See merge request gitlab-org/gitlab-ce!14387
2018-01-18 11:37:16 +00:00
2af0b083c6
Merge branch 'winh-stop-jobs-modal' into 'master'
...
Add modal for stopping jobs in admin area
Closes #41305
See merge request gitlab-org/gitlab-ce!16283
2018-01-18 10:53:18 +00:00
76f16bbf71
Add modal for stopping jobs in admin area
2018-01-18 10:05:40 +01:00
337ced28bc
reference triggers.values for permitted parameters
2018-01-17 09:55:00 +01:00
eb5e0e921c
add missing permitted param
2018-01-17 09:55:00 +01:00
536a47b4b7
Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
...
[10.3] Migrate `can_push` column from `keys` to `deploy_keys_project`
See merge request gitlab/gitlabhq!2276
(cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c)
1f2bd3c0 Backport to 10.3
2018-01-16 17:04:51 -08:00
729f05f0e3
Adds Rubocop rule for line break around conditionals
2018-01-11 16:34:01 +00:00
50d7c356c2
Present member collection at the controller level
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-12 18:14:58 +01:00
f1ae1e39ce
Move the circuitbreaker check out in a separate process
...
Moving the check out of the general requests, makes sure we don't have
any slowdown in the regular requests.
To keep the process performing this checks small, the check is still
performed inside a unicorn. But that is called from a process running
on the same server.
Because the checks are now done outside normal request, we can have a
simpler failure strategy:
The check is now performed in the background every
`circuitbreaker_check_interval`. Failures are logged in redis. The
failures are reset when the check succeeds. Per check we will try
`circuitbreaker_access_retries` times within
`circuitbreaker_storage_timeout` seconds.
When the number of failures exceeds
`circuitbreaker_failure_count_threshold`, we will block access to the
storage.
After `failure_reset_time` of no checks, we will clear the stored
failures. This could happen when the process that performs the checks
is not running.
2017-12-08 09:11:39 +01:00
b8a3931925
Add custom brand text on new project pages
2017-12-04 17:22:59 +01:00
354256d04c
Merge branch 'refactor-services-for-audit-events-ce' into 'master'
...
[CE] Refactor controller calls into services
Closes gitlab-ee#3544
See merge request gitlab-org/gitlab-ce!15023
2017-11-03 08:40:00 +00:00
9cb9a86f37
fix typo
2017-11-02 14:33:56 +01:00
32ef7ed7d6
fix specs
2017-11-02 13:14:56 +01:00
3f24f9ed18
Add sudo API scope
2017-11-02 11:39:03 +01:00
37eb00ce5b
fix specs
2017-11-02 08:49:36 +01:00
232bdd47d9
refactor code
2017-10-31 09:03:59 +01:00
72b7b10d52
add applications controller logic
2017-10-31 09:03:59 +01:00
22ade6e7cb
Merge branch '38720-sort-admin-runners' into 'master'
...
Add sort runners on admin runners
Closes #38720
See merge request gitlab-org/gitlab-ce!14661
2017-10-11 10:04:04 +00:00
d13669716a
Create idea of read-only database
...
In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo
secondary node). But in GitLab CE it also might be useful to have the
"read-only" idea around. So port it back to GitLab CE.
Also having the principle of read-only in GitLab CE would hopefully
lead to less errors introduced, doing write operations when there
aren't allowed for read-only calls.
Closes gitlab-org/gitlab-ce#37534 .
2017-10-06 22:37:40 +02:00
0c0c2ecd99
Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
...
# Conflicts:
# app/controllers/admin/users_controller.rb
# app/controllers/confirmations_controller.rb
# app/controllers/profiles/emails_controller.rb
# app/models/user.rb
# app/services/emails/base_service.rb
# app/services/emails/destroy_service.rb
# app/views/devise/mailer/confirmation_instructions.html.haml
# lib/api/users.rb
# spec/services/emails/destroy_service_spec.rb
2017-10-05 12:48:22 +02:00
6aff498426
Add sort runners on admin runners
2017-10-04 00:15:27 +09:00
1dcb711110
refactor emails service
2017-09-28 08:46:39 +02:00
67d06dee30
refactor users update service
2017-09-28 08:46:39 +02:00
4a6ec7c947
refactor some controllers to make them EE friendly
2017-09-28 08:46:39 +02:00
9621dd0c9d
refactor services to match EE signature
2017-09-28 08:46:39 +02:00
b2d5379161
fix calls to Emails::DestroyService
2017-09-23 15:24:53 +02:00
9254343117
Fix notification message when admin label was modified
2017-09-18 11:09:00 +02:00
cc2daa74d8
created services for keys
2017-09-15 15:35:24 +00:00
9b177bb7c9
Revert "Merge branch 'revert-f2421b2b' into 'master'"
...
This reverts merge request !14148
2017-09-11 15:44:42 +00:00
52a2423e37
Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'"
...
This reverts merge request !13619
2017-09-08 14:48:44 +00:00
523a1c69ab
Merge branch '23079-remove-default-scope-in-sortable' into 'master'
...
Removes default scope from sortable
Closes #23079
See merge request !13558
2017-09-07 16:15:32 +00:00
f2421b2b97
Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'
...
Add option to change navigation color palette
Closes #35012
See merge request !13619
2017-09-07 15:56:00 +00:00
cfd475a45e
Removes default scope from sortable
2017-09-07 13:01:59 +01:00
c7a77dced7
Remove the `pretty` parameter for `usage_data`
2017-09-06 14:25:09 -04:00
6c49a62800
Restore some changes from !9199
2017-09-06 12:54:09 -05:00
8a2aab447a
Merge branch 'tc-test-admin-log-links' into 'master'
...
Put Admin loggers in before_action for easier overriding in EE
See merge request !14081
2017-09-06 15:56:12 +00:00
ddf892b9f2
Put loggers in before_action for easier overriding in EE
...
Make it easier to override the set of loggers, by putting them in a
separate method.
Also modify spec so it tests for links, instead of checking for
regular text.
2017-09-06 15:25:51 +02:00
a768e1b704
Merge branch '28938-password-change-workflow-for-admins' into 'master'
...
Changes the password change workflow for admins.
Closes #28938
See merge request !13901
2017-08-31 12:42:51 +00:00
0ffa4772c2
Changes the password change workflow for admins.
2017-08-31 12:25:24 +01:00
d184f27ed3
Refactor Admin::ProjectsFinder by extracting finders as private methods
2017-08-24 10:11:00 +02:00
e288afec9c
Refactor `Admin::LogsController#show`
...
We should be defining the list of loggers in the controller, not the
view.
2017-08-22 17:12:48 -04:00
26bb50412c
Cache Appearance instances in Redis
...
This caches the result of Appearance.first in a similar fashion to how
ApplicationSetting instances are cached. We also add some NOT NULL
constraints to the table and correct the timestamp types.
Fixes gitlab-org/gitlab-ce#36066 , fixes gitlab-org/gitlab-ce#31698
2017-08-10 12:45:49 +02:00
3598e60bf2
Add a Circuitbreaker for storage paths
2017-08-04 15:38:48 +02:00
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
f837cd6611
Use params#require instead params[] access
2017-07-27 12:09:46 -04:00
e561b142fa
Backport gitlab-ee!2456
2017-07-27 12:09:46 -04:00
ea1012ccb4
Make the attribute list for application settings reusable
2017-07-27 11:49:27 +02:00
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
22d53f0607
Fixes 500 error caused by pending delete projects in admin dashboard
2017-07-25 17:59:47 +01:00
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
Douwe Maan
Phil Hughes
Winnie Hellmann
Alexis Reigel
🙈 jacopo beschi 🙉
Rémy Coutable
Bob Van Landuyt
Markus Koller
Grzegorz Bizon
James Lopez
Douwe Maan
Toon Claes
Takuya Noguchi
Brett Walker
Robert Schilling
haseeb
Annabel Dunstone Gray
Rubén Dávila
Sean McGivern
Tiago Botelho
Robert Speicher
Dmitriy Zaporozhets
Mehdi Lahmam
Yorick Peterse
Bob Van Landuyt
Robert Speicher
Oswaldo Ferreira