summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-317-7/+144
|\
| * Merge branch 'gitaly-opt-out' into 'master'Rémy Coutable2017-05-302-2/+2
| |\
| | * Enable Gitaly by default in GitLab 9.3Jacob Vosmaer2017-05-302-2/+2
| * | 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 '31849-pipeline-show-view-realtime' into 'master'Phil Hughes2017-05-301-3/+3
| |\ \
| | * | Creates a mediator for pipeline details vue in order to mount several vue app...Filipa Lacerda2017-05-261-3/+3
| * | | 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 branch 'locale-region-fix' into 'master'Douwe Maan2017-05-261-1/+1
| |\ \ \ \ \
| | * | | | | Fixed locale frontend not picking up regionslocale-region-fixPhil Hughes2017-05-251-1/+1
* | | | | | | Use another scope to add the - prefix, feedback:Lin Jen-Shin2017-05-311-25/+27
* | | | | | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-261-1/+1
* | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2615-58/+105
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '32737-audit-long-term-cacheability-of-webpack-assets' into 'mas...Tim Zallmann2017-05-261-2/+16
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | name all webpack chunks to improve long term cacheabilityMike Greiling2017-05-251-1/+13
| | * | | | | add NameAllModulesPlugin to cover shortcomings of NamedModulesPluginMike Greiling2017-05-251-1/+3
| | |/ / / /
| * | | | | 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 'revert-b0498c17' into 'master'Robert Speicher2017-05-257-45/+44
| |\ \ \ \ \
| | * | | | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-247-45/+44
| * | | | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-254-3/+17
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Implement web hooks loggingAlexander Randa2017-05-254-3/+17
| * | | | | | user can reset his rss token on the account pageAlexis Reigel2017-05-241-0/+1
| * | | | | | add rss_token attribute to user modelAlexis Reigel2017-05-241-0/+1
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-244-6/+25
| |\ \ \ \ \
| | * | | | | Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-237-44/+45
| | * | | | | Fix specsDouwe Maan2017-05-231-1/+1
| | * | | | | Fix ambiguous routing issues by teaching router about reserved wordsDouwe Maan2017-05-237-43/+61
| | | |_|_|/ | | |/| | |
| * | | | | drop HashedModuleIdsPlugin in favor of NamedModulesPlugin in all environments32835-stop-using-webpack-hashedmoduleidsplugin-in-productionMike Greiling2017-05-231-4/+2
| | |_|/ / | |/| | |
| * | | | Update gitlab.yml with default settingzj-ps-update-gitlab-ymlZ.J. van de Weg2017-05-221-1/+1
| |/ / /
| * | | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-191-1/+0
| |\ \ \
| | * | | Remove routeOswaldo Ferreira2017-05-191-1/+0
| | |/ /
| * | | 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
| * | | | Merge branch 'zj-increase-accuracy-ps' into 'master'Kamil Trzciński2017-05-191-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Run the schedule worker once an hour by defaultzj-increase-accuracy-psZ.J. van de Weg2017-05-181-1/+1
| | |/ /
| * | | Consolidate user avatar Vue logicBryce Johnson2017-05-181-2/+3
| |/ /
* | | Complete all legacy builds URL. Tests are addedLin Jen-Shin2017-05-191-22/+2
* | | Use a single route, reducing duplicationLin Jen-Shin2017-05-181-27/+16
* | | Disable rubocop hash check for blocksLin Jen-Shin2017-05-181-0/+6
* | | Add backward compatible routes for buildsLin Jen-Shin2017-05-181-0/+28
* | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-173-3/+3
|/ /
* | Merge branch 'use-common-vue-for-merge-request-widget' into 'master' Fatih Acet2017-05-161-0/+1
|\ \
| * | ensure merge-request-widget utilizes common_vue bundleuse-common-vue-for-merge-request-widgetMike Greiling2017-05-151-0/+1
* | | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' Douwe Maan2017-05-162-0/+2
|\ \ \
View Lorry Controller Status