summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-315-2/+139
|\
| * Merge branch 'gitaly-opt-out' into 'master'Rémy Coutable2017-05-301-1/+1
| |\
| | * Enable Gitaly by default in GitLab 9.3Jacob Vosmaer2017-05-301-1/+1
| * | Merge branch 'fix/gb/improve-active-record-test-extensions' into 'master'Rémy Coutable2017-05-301-1/+1
| |\ \ | | |/ | |/|
| | * Make `ActiveRecord::Migrator` idempotent again in test envfix/gb/improve-active-record-test-extensionsGrzegorz Bizon2017-05-291-1/+1
| * | Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'Rémy Coutable2017-05-301-0/+1
| |\ \
| | * | 31616-add-uptime-of-gitlab-instance-in-admin-areajboltz882017-05-291-0/+1
| * | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-291-0/+132
| |\ \ \ | | |_|/ | |/| |
| | * | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-171-0/+132
| * | | Merge branch 'fix-counter-cache-for-acts-as-taggable' into 'master'Stan Hu2017-05-261-0/+4
| |\ \ \
| | * | | Fix Counter Cache not being disabled for acts-on-taggablefix-counter-cache-for-acts-as-taggableKamil Trzcinski2017-05-261-0/+4
| | | |/ | | |/|
* | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-263-3/+7
|\ \ \ \ | |/ / /
| * | | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'Douwe Maan2017-05-251-0/+1
| |\ \ \
| | * | | Bugfix: Always use the default language when generating emails.32748-emails-are-being-sent-with-the-wrong-languageRuben Davila2017-05-251-0/+1
| | |/ /
| * | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-251-1/+4
| |\ \ \ | | |/ / | |/| |
| | * | Implement web hooks loggingAlexander Randa2017-05-251-1/+4
| * | | Merge branch '31933-improve-rspec-profiling-enabling' into 'master'Stan Hu2017-05-191-1/+1
| |\ \ \
| | * | | Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty31933-improve-rspec-profiling-enablingRémy Coutable2017-05-191-1/+1
| | |/ /
| * | | Run the schedule worker once an hour by defaultzj-increase-accuracy-psZ.J. van de Weg2017-05-181-1/+1
| |/ /
* | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-171-1/+1
|/ /
* | Don't reuse gRPC channelsJacob Vosmaer2017-05-151-2/+4
|/
* Allow disabling usage ping in `gitlab.yml`Sean McGivern2017-05-111-0/+1
* Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-103-5/+5
* Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-101-1/+1
* Use relative paths for group/project/user avatarsblackst0ne2017-05-101-1/+1
* Merge branch 'revert-58d1cd6b' into 'master' Stan Hu2017-05-071-1/+1
|\
| * Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-depreca...revert-58d1cd6bStan Hu2017-05-071-1/+1
* | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-071-3/+3
|/
* Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection ca...fix-rspec_profiling-establish_connection-string-deprecationLuke "Jared" Bennett2017-05-071-1/+1
* Use an absolute path for locale path in FastGettext configuse-absolute-path-for-gettext-configRuben Davila2017-05-051-1/+1
* Merge branch 'mrchrisw-import-shell-timeout'Sean McGivern2017-05-051-0/+1
|\
| * Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeoutChris Wilson2017-04-271-0/+1
* | First round of updates from the code review.Ruben Davila2017-05-021-1/+3
* | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-024-9/+12
|\ \
| * \ Merge branch 'remove-unused-initializer' into 'master' Douwe Maan2017-05-021-5/+0
| |\ \
| | * | Remove unused initializerremove-unused-initializerSean McGivern2017-05-021-5/+0
| * | | Update Carrierwave and fog-coreZeger-Jan van de Weg2017-05-011-0/+2
| |/ /
| * | Resolve "rspec_profiling is enabled for MySQL"Rémy Coutable2017-04-281-4/+4
| * | Merge branch 'test-pg' into 'master' Rémy Coutable2017-04-241-1/+1
| |\ \
| | * | Set profiler only for postgresql not mysqlLin Jen-Shin2017-04-101-1/+1
| * | | Make location of gitlab_workhorse_secret configurableJakub Jirutka2017-04-191-0/+6
| | |/ | |/|
* | | Fix Rubocop complains.Ruben Davila2017-05-021-1/+0
* | | Adjust regex used in order to parse inline content.Ruben Davila2017-04-271-2/+2
* | | Adjust the patch for the gettext_i18n_rails and gettext_i18n_rails_js gems.Ruben Davila2017-04-261-24/+3
* | | Add ability to parse *.vue files through the `ruby gettext:find` scriptRuben Davila2017-04-251-0/+15
* | | Parse translate filters from JS files.Ruben Davila2017-04-251-2/+29
* | | Parse the translate-plural filter in HAML viewsRuben Davila2017-04-241-0/+4
* | | Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-04-241-1/+0
|\ \ \
| * | | Revert line being commented outjs-translationsPhil Hughes2017-04-211-12/+12
| * | | Merge remote-tracking branch 'origin/28433-internationalise-cycle-analytics-p...Phil Hughes2017-04-212-1/+17
| |\ \ \