summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into refactor-pipelines-listrefactor-pipelines-listClement Ho2018-02-261-8/+3
|\
| * Refactor wildcard dispatcher importsClement Ho2018-02-261-8/+2
| * Move EE-specific JavaScript files to ee/app/assets/javascriptsRémy Coutable2018-02-261-0/+1
* | Remove commit_pipelines webpack entry pointClement Ho2018-02-261-2/+0
|/
* Remove webpack bundle tags for blobJacob Schatz2018-02-261-1/+0
* Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failedJacob Vosmaer (GitLab)2018-02-261-1/+1
* Merge branch 'master' into 'boards-bundle-refactor'Jacob Schatz2018-02-236-17/+60
|\
| * Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master'Jacob Schatz2018-02-231-1/+0
| |\
| | * Refactored webpack bundle tag for deploy keysproject-deploy-keys-bundle-tag-refactorConstance Okoghenun2018-02-231-1/+0
| * | Merge branch 'reduce-webpack-merge-conflicts' into 'master'Jacob Schatz2018-02-231-8/+10
| |\ \
| | * | move webpack bundles we intend to keep below the list of bundles we're refact...reduce-webpack-merge-conflictsMike Greiling2018-02-231-8/+10
| * | | Merge branch 'remove-issues-show' into 'master'Jacob Schatz2018-02-231-2/+0
| |\ \ \ | | |/ /
| | * | remove issue_show webpack bundle in favor of pages/projects/issues/show/index.jsremove-issues-showMike Greiling2018-02-231-2/+0
| | |/
| * | Backport custom metrics ce componentsPaweł Chojnacki2018-02-231-1/+3
| * | Add DNS verification to Pages custom domainsNick Thomas2018-02-234-1/+14
| |/
| * Port `read_cross_project` ability from EEBob Van Landuyt2018-02-221-0/+25
| * Backport of Webpack auto include for EE importsClement Ho2018-02-221-6/+8
* | Resolved conflicts with masterConstance Okoghenun2018-02-213-25/+22
|\ \ | |/
| * Rest of Dispatcher RefactorJacob Schatz2018-02-212-3/+1
| * #28481: Display time tracking totals on milestone pageRiccardo Padovani2018-02-211-1/+1
| * Merge branch 'upgrade-frontend-build-dependencies' into 'master'Tim Zallmann2018-02-211-2/+20
| |\
| | * approve change in dependenciesupgrade-frontend-build-dependenciesMike Greiling2018-02-201-0/+6
| | * approve change in dependenciesMike Greiling2018-02-201-0/+6
| | * approve change in dependenciesMike Greiling2018-02-201-2/+8
| * | Merge branch 'refactor-jobs-show-haml' into 'master'Jacob Schatz2018-02-201-2/+0
| |\ \
| | * \ Merge branch 'master' into 'refactor-jobs-show-haml'Clement Ho2018-02-162-4/+2
| | |\ \
| | * | | Add dispatcher imports for job details bundleClement Ho2018-02-151-3/+1
| * | | | Remove "notes" bundle from webpack configMike Greiling2018-02-201-2/+0
| * | | | Merge branch 'dispatcher-mr-haml' into 'master'Jacob Schatz2018-02-201-1/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'master' into dispatcher-mr-hamlClement Ho2018-02-193-4/+4
| | |\ \ \
| | * \ \ \ Merge branch 'master' into dispatcher-mr-hamlClement Ho2018-02-162-4/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Add dispatcher imports for bundles used in merge request show pathClement Ho2018-02-151-2/+1
| | | |_|/ | | |/| |
| * | | | remove common_d3 bundleMike Greiling2018-02-191-12/+0
| * | | | remove graphs_show webpack bundleMike Greiling2018-02-191-2/+0
* | | | | Resolved conflicts with masterConstance Okoghenun2018-02-203-7/+4
|\ \ \ \ \ | |/ / / /
| * | | | Chart.html.haml refactorJacob Schatz2018-02-191-3/+0
| | |_|/ | |/| |
| * | | Increase feature flag cache TTL to one hourYorick Peterse2018-02-191-1/+1
| * | | Merge branch 'ee-webpack-backport' into 'master'Filipa Lacerda2018-02-191-2/+2
| |\ \ \
| | * | | Backport webpack.config.js changes from EEee-webpack-backportPhil Hughes2018-02-161-2/+2
| | | |/ | | |/|
| * | | Allow oxford commas and spaces before commas in MR issue closing pattern.Vicky Chijwani2018-02-171-1/+1
| |/ /
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into boards-...Constance Okoghenun2018-02-163-8/+8
|\ \ \ | |/ /
| * | Merge branch 'prometheus-bundle-tag-refactor' into 'master'Phil Hughes2018-02-161-1/+0
| |\ \
| | * | Removed prometheus_metrics webpack bundle tagprometheus-bundle-tag-refactorConstance Okoghenun2018-02-161-1/+0
| * | | Merge branch 'pipeline-chart-bundle' into 'master'Filipa Lacerda2018-02-161-3/+1
| |\ \ \ | | |/ / | |/| |
| | * | Updated pipelines charts to use dynamic webpack bundlepipeline-chart-bundlePhil Hughes2018-02-151-3/+1
| * | | Remove Webpack bundle tag for users:showConstance Okoghenun2018-02-151-1/+0
| * | | Filter secret variable values from logsStan Hu2018-02-151-0/+2
| | |/ | |/|
| * | Merge branch 'project-integrations-form-dispatcher-refactor' into 'master'Fatih Acet2018-02-151-1/+0
| |\ \
| | * | Removed integrations webpack bundle tagproject-integrations-form-dispatcher-refactorConstance Okoghenun2018-02-151-1/+0
| * | | Remove internal api calls from the rack::attack throttlingFrancisco Javier López2018-02-151-0/+5
| | |/ | |/|
View Lorry Controller Status