| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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. | ||||
| * | | First round of updates from the code review. | Ruben Davila | 2017-05-02 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-02 | 4 | -9/+12 |
| |\ \ | |||||
| | * \ | Merge branch 'remove-unused-initializer' into 'master' | Douwe Maan | 2017-05-02 | 1 | -5/+0 |
| | |\ \ | | | | | | | | | | | | | | | | | Remove unused initializer See merge request !11036 | ||||
| | | * | | Remove unused initializerremove-unused-initializer | Sean McGivern | 2017-05-02 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | We don't appear to have an `active_record_query_trace` dependency any more. | ||||
| | * | | | Update Carrierwave and fog-core | Zeger-Jan van de Weg | 2017-05-01 | 1 | -0/+2 |
| | |/ / | |||||
| | * | | Resolve "rspec_profiling is enabled for MySQL" | Rémy Coutable | 2017-04-28 | 1 | -4/+4 |
| | | | | |||||
| | * | | Merge branch 'test-pg' into 'master' | Rémy Coutable | 2017-04-24 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Test both PostgreSQL and MySQL for the win Closes #2582 See merge request !10156 | ||||
| | | * | | Set profiler only for postgresql not mysql | Lin Jen-Shin | 2017-04-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10156#note_26812609 | ||||
| | * | | | Make location of gitlab_workhorse_secret configurable | Jakub Jirutka | 2017-04-19 | 1 | -0/+6 |
| | | |/ | |/| | | | | | | | | | | | | | Hard-coding location of configuration files is very bad practice. This patch applies the same approach as currently used for gitlab_shell_secret file. | ||||
| * | | | Fix Rubocop complains. | Ruben Davila | 2017-05-02 | 1 | -1/+0 |
| | | | | |||||
| * | | | Adjust regex used in order to parse inline content. | Ruben Davila | 2017-04-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | e.g: %h4 {{ __('foo') }} Problem was it was being parsed as: %h4 = _('foo') And the correct content should be: %h4= _('foo') | ||||
| * | | | Adjust the patch for the gettext_i18n_rails and gettext_i18n_rails_js gems. | Ruben Davila | 2017-04-26 | 1 | -24/+3 |
| | | | | | | | | | | | | | | | | This is more simple now given we're using the recommended code to annotate content to be translated. | ||||
| * | | | Add ability to parse *.vue files through the `ruby gettext:find` script | Ruben Davila | 2017-04-25 | 1 | -0/+15 |
| | | | | |||||
| * | | | Parse translate filters from JS files. | Ruben Davila | 2017-04-25 | 1 | -2/+29 |
| | | | | |||||
| * | | | Parse the translate-plural filter in HAML views | Ruben Davila | 2017-04-24 | 1 | -0/+4 |
| | | | | |||||
| * | | | Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-04-24 | 1 | -1/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | Conflicts: config/initializers/gettext_rails_i18n_patch.rb | ||||
| | * | | | Revert line being commented outjs-translations | Phil Hughes | 2017-04-21 | 1 | -12/+12 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch ↵ | Phil Hughes | 2017-04-21 | 2 | -1/+17 |
| | |\ \ \ | | | | | | | | | | | | | | | | 'origin/28433-internationalise-cycle-analytics-page' into js-translations | ||||
| | | * | | | Monkey patch gettext_i18n_rails so it can parse content in Mustache format | Ruben Davila | 2017-04-20 | 1 | -0/+17 |
| | | | | | | |||||
| * | | | | | Monkey patch gettext_i18n_rails so it can parse content in Mustache format | Ruben Davila | 2017-04-24 | 1 | -0/+19 |
| | |/ / / |/| | | | |||||
| * | | | | Some small fixes for the current I18n implementation | Ruben Davila | 2017-04-20 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-04-19 | 1 | -7/+23 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: db/schema.rb | ||||
| | * | | Don't use `send` in settings initializer | Sean McGivern | 2017-04-14 | 1 | -6/+6 |
| | | | | |||||
| | * | | Remove unused user activities code | Sean McGivern | 2017-04-14 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add new ScheduleUpdateUserActivityWorker and UpdateUserActivityWorker | Rémy Coutable | 2017-04-14 | 1 | -0/+5 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Port 'Add EE usage ping' to CE | Sean McGivern | 2017-04-14 | 1 | -0/+11 |
| | |/ | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/557 | ||||
| * | | Fix Rubocop complains plus some small refactor | Ruben Davila | 2017-04-19 | 1 | -1/+1 |
| | | | |||||
| * | | Add missing initializer for FastGettext | Ruben Davila | 2017-04-12 | 1 | -0/+3 |
| |/ | |||||
| * | Change configuration in gitlab.com as trigger_schedule_worker will perform ↵ | Shinya Maeda | 2017-04-06 | 1 | -1/+1 |
| | | | | | twice a day 2 | ||||
| * | Rename ScheduledTrigger to TriggerSchedule. Because table structure changed. | Shinya Maeda | 2017-04-06 | 1 | -3/+3 |
| | | |||||
| * | Add config for worker | Shinya Maeda | 2017-04-06 | 1 | -0/+3 |
| | | |||||
| * | Merge branch 'fix/gh-import-status-check' into 'master' | Sean McGivern | 2017-04-06 | 1 | -0/+3 |
| |\ | | | | | | | | | | | | | Periodically mark projects that are stuck in importing as failed Closes #17709 See merge request !10207 | ||||
| | * | Periodically mark projects that are stuck in importing as failed | James Lopez | 2017-04-05 | 1 | -0/+3 |
| | | | | | | | | | | | | | Adds import jid to projects Refactor middleware to set custom expiration time via sidekiq options Add completed_jids option to sidekiq status and a few other changes | ||||
| * | | Deal with Rails autoload instance variable resets | Jacob Vosmaer | 2017-04-05 | 1 | -13/+1 |
| |/ | | | | | | | | Rails auto-load (a development feature) can end up resetting instance variables on classes. This breaks Gitlab::GitalyClient, which uses instance variables to keep global hashes to look up channels and addresses. This change adds code that regenerates the hashes if they suddenly become nil. | ||||
| * | Enable the `bullet_logger` setting; enable `raise` in test environmentrs-bullet-raise | Robert Speicher | 2017-04-03 | 1 | -4/+9 |
| | | |||||
| * | Add support for Gitaly calls over TCP connectionfeature/support-grpc-calls-over-tcp-conn | Ahmad Sherif | 2017-04-03 | 1 | -1/+1 |
| | | | | | Closes gitaly#166 | ||||
| * | Merge branch '24784-system-notes-meta-data' into 'master' | Sean McGivern | 2017-03-30 | 1 | -1/+1 |
| |\ | | | | | | | | | Add metadata for system notes See merge request !9964 | ||||
| | * | Add system_note_metadata model | Jarka Kadlecova | 2017-03-28 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'gitaly-socket-per-shard' into 'master' | Sean McGivern | 2017-03-29 | 2 | -13/+38 |
| |\ \ | |/ |/| | | | | | One Gitaly connection per storage shard See merge request !10150 | ||||
| | * | Change socket_path to gitaly_address | Jacob Vosmaer | 2017-03-29 | 1 | -3/+17 |
| | | | |||||
| | * | Expand relative paths in storages | Jacob Vosmaer | 2017-03-29 | 1 | -10/+19 |
| | | | |||||
| | * | Separate GRPC channels per repository storage | Jacob Vosmaer | 2017-03-29 | 2 | -2/+4 |
| | | | |||||
| * | | RSpec profiling: Prepend the branch name with `ce` or `ee` | Rémy Coutable | 2017-03-24 | 1 | -1/+5 |
| |/ | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Added Gitlab::Database.config | Yorick Peterse | 2017-03-17 | 1 | -1/+1 |
| | | | | | | | | | This returns the ActiveRecord configuration for the current environment. While CE doesn't use this very often, EE will use it in a few places for the database load balancing code. I'm adding this to CE so we don't end up with merge conflicts in this file. | ||||
| * | Merge branch 'pages-multiple-ips-doc' into 'master' | Kamil Trzciński | 2017-03-16 | 1 | -2/+2 |
| |\ | | | | | | | | | The GitLab Pages external-http and external-https arguments can be specified multiple times See merge request !9812 | ||||
| | * | The GitLab Pages external-http and external-https arguments can be specified ↵ | Nick Thomas | 2017-03-08 | 1 | -2/+2 |
| | | | | | | | | | multiple times | ||||
| * | | Futher rename the CI variableszj-rename-ci-vars | Z.J. van de Weg | 2017-03-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch '29389-fix-already-initialized-constants' into 'master' | Robert Speicher | 2017-03-14 | 2 | -9/+6 |
| |\ \ | | | | | | | | | | | | | | | | | | | Remove explicit `require` calls, and use `require_dependency` when needed Closes #29389 See merge request !9899 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |