Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adds Rubocop rule for line break around conditionals | 🙈 jacopo beschi 🙉 | 2018-01-11 | 1 | -0/+2 |
| | |||||
* | Allow password authentication to be disabled entirely | Markus Koller | 2017-11-23 | 1 | -1/+1 |
| | |||||
* | Set the default gitlab-shell timeout to 3 hours | Nick Thomas | 2017-11-21 | 1 | -1/+1 |
| | |||||
* | Cleanup transaction metrics | Pawel Chojnacki | 2017-11-02 | 1 | -0/+1 |
| | |||||
* | Merge branch 'bvl-circuitbreaker-improvements' into 'master' | Douwe Maan | 2017-10-17 | 1 | -11/+0 |
|\ | | | | | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842 | ||||
| * | Read circuitbreaker settings from `Gitlab::CurrentSettings` | Bob Van Landuyt | 2017-10-17 | 1 | -11/+0 |
| | | | | | | | | Instead of from the configuration file | ||||
* | | Make usage ping scheduling more robust39017-gitlabusagepingworker-is-not-running-on-gitlab-com | Sean McGivern | 2017-10-16 | 1 | -5/+7 |
|/ | | | | | | | | | | | | | | On GitLab.com, we see that cron jobs sometimes don't run. This appears to be because the process that polls for current cron jobs only has a 60 second validity period, so if (for whatever reason) it misses those 60 seconds, we have to wait until the next execution. For the usage ping, this is particularly problematic, as that's only scheduled to run once a week. Changing it to run for every minute in a 10 minute period should work around this, if the above diagnosis is correct. The job itself obtains an exclusive lease for 24 hours, so rescheduling in quick succession is safe. | ||||
* | Incorporate feedback | Zeger-Jan van de Weg | 2017-10-04 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into 34102-online-view-of-artifacts-fe | Eric Eastwood | 2017-10-04 | 1 | -1/+1 |
|\ | |||||
| * | Add "implements" to the default issue closing message regex | Guilherme Vieira | 2017-10-02 | 1 | -1/+1 |
| | | |||||
* | | Redirect to pages daemon | Zeger-Jan van de Weg | 2017-10-03 | 1 | -9/+10 |
|/ | |||||
* | Remove Grit settings from default settingssh-remove-additional-grit-settings | Stan Hu | 2017-09-23 | 1 | -3/+1 |
| | | | | | This is a follow-up to https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1956 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7308. | ||||
* | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8 | Annabel Dunstone Gray | 2017-09-11 | 1 | -0/+1 |
| | | | This reverts merge request !14148 | ||||
* | Read import sources from setting at first initialization | Visay Keo | 2017-09-09 | 1 | -1/+1 |
| | |||||
* | Revert "Merge branch ↵revert-f2421b2b | Rubén Dávila | 2017-09-08 | 1 | -1/+0 |
| | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619 | ||||
* | Restore some changes from !9199 | Rubén Dávila | 2017-09-06 | 1 | -0/+1 |
| | |||||
* | Profile updates from providers | Alexander Keramidas | 2017-09-06 | 1 | -1/+14 |
| | |||||
* | Default LDAP config verify_certificates to true | Michael Kozono | 2017-08-30 | 1 | -12/+5 |
| | |||||
* | Setup repositories settings properlymk-setup-settings-properly | Michael Kozono | 2017-08-17 | 1 | -1/+5 |
| | |||||
* | Setup LDAP settings properly | Michael Kozono | 2017-08-17 | 1 | -0/+4 |
| | |||||
* | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelists | Robert Speicher | 2017-08-14 | 1 | -0/+2 |
| | | | | | An upcoming update to rubocop-gitlab-security added additional violations. | ||||
* | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-cop | Rémy Coutable | 2017-08-09 | 1 | -1/+1 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch '31207-clean-locked-merge-requests' into 'master' | Stan Hu | 2017-08-08 | 1 | -0/+4 |
|\ | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207 | ||||
| * | Store MergeWorker JID on merge request, and clean up stuck merges | Oswaldo Ferreira | 2017-08-07 | 1 | -0/+4 |
| | | |||||
* | | Add sidekiq metrics endpoint and add http server to sidekiq | Paweł Chojnacki | 2017-08-07 | 1 | -0/+4 |
|/ | |||||
* | Move hostname to Gitlab::Environment | Bob Van Landuyt | 2017-08-04 | 1 | -1/+0 |
| | |||||
* | Add a Circuitbreaker for storage paths | Bob Van Landuyt | 2017-08-04 | 1 | -0/+12 |
| | |||||
* | Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵ | Rémy Coutable | 2017-07-28 | 1 | -1/+1 |
| | | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Support custom directory in gitlab:backup:create task | Markus Koller | 2017-07-27 | 1 | -4/+0 |
| | |||||
* | Add warning about certificate verification on load | Michael Kozono | 2017-07-26 | 1 | -1/+10 |
| | |||||
* | Move backwards compatibility logic out of the code | Michael Kozono | 2017-07-26 | 1 | -1/+5 |
| | | | | And closer to the configuration setup. The code doesn’t need to know about this. | ||||
* | Add LDAP config options | Michael Kozono | 2017-07-26 | 1 | -0/+5 |
| | |||||
* | Merge branch 'fixes-for-internal-auth-disabled' into 'master' | Sean McGivern | 2017-07-14 | 1 | -1/+1 |
|\ | | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491 | ||||
| * | Fixes needed when GitLab sign-in is not enabled | Robin Bobbitt | 2017-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge branch '33949-remove-healthcheck-access-token' into 'master' | Sean McGivern | 2017-07-11 | 1 | -3/+4 |
|\ \ | |/ |/| | | | | | | | | | Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612 | ||||
| * | Merge prometheus unicorn sampler settigns within monitoring settings | Pawel Chojnacki | 2017-07-05 | 1 | -6/+1 |
| | | |||||
| * | Add spaces between test phases | Pawel Chojnacki | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | | + fix wrong test setup | ||||
| * | correctly handle transforming settings into useful datastructure | Pawel Chojnacki | 2017-07-05 | 1 | -1/+0 |
| | | |||||
| * | Remove the need to use health check token | Pawel Chojnacki | 2017-07-05 | 1 | -0/+7 |
| | | | | | | | | | | in favor of whitelist that will be used to control the access to monitoring resources | ||||
* | | Remove option to disable Gitaly completely | Jacob Vosmaer | 2017-07-07 | 1 | -1/+0 |
|/ | |||||
* | Instrument Unicorn with Ruby exporter | Paweł Chojnacki | 2017-07-04 | 1 | -0/+6 |
| | |||||
* | Sync email address from specified omniauth provider | Robin Bobbitt | 2017-06-07 | 1 | -0/+1 |
| | |||||
* | Enable Gitaly by default in GitLab 9.3 | Jacob Vosmaer | 2017-05-30 | 1 | -1/+1 |
| | |||||
* | Merge branch '17848-web-hook-logging' into 'master' | Dmitriy Zaporozhets | 2017-05-25 | 1 | -1/+4 |
|\ | | | | | | | | | | | | | Implement Web Hooks calls logging Closes #17848 See merge request !11027 | ||||
| * | Implement web hooks logging | Alexander Randa | 2017-05-25 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | * 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 | ||||
* | | Run the schedule worker once an hour by defaultzj-increase-accuracy-ps | Z.J. van de Weg | 2017-05-18 | 1 | -1/+1 |
|/ | | | | [ci skip] | ||||
* | Allow disabling usage ping in `gitlab.yml` | Sean McGivern | 2017-05-11 | 1 | -0/+1 |
| | | | | | | | | | Setting `usage_ping_enabled` to false in `gitlab.yml`: 1. Disables the usage ping, regardless of the value stored in the database. 2. Prevents the usage ping from being enabled through the admin panel. It can only be enabled by either removing the line from `gitlab.yml` and configuring through the admin panel, or setting it to true in `gitlab.yml`. | ||||
* | Add Pipeline Schedules that supersedes experimental Trigger Schedule | Zeger-Jan van de Weg | 2017-05-07 | 1 | -3/+3 |
| | |||||
* | Merge branch 'mrchrisw-import-shell-timeout' | Sean McGivern | 2017-05-05 | 1 | -0/+1 |
|\ | |||||
| * | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeout | Chris Wilson | 2017-04-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | GitLab uses the import_project method in GitLab Shell, This method uses a timeout for the operation, hardcoded to 800 seconds. With this MR the timeout is now configurable in the gitlab_shell settings. |