summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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 '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
| |/ |/|
* | Converted pipeline_schedules bundles into automatic webpack entriespipeline-schedule-webpackPhil Hughes2018-02-151-2/+0
|/
* Addressed mr observationsjivl-update-katexJose Ivan Vargas2018-02-121-2/+0
* Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-129-4/+19
|\
| * make sure there is a dependency on Gitlab::CurrentSettings isbw-fix-autoload-issueBrett Walker2018-02-091-0/+1
| * Merge branch 'feature/oidc-groups-claim' into 'master'Douwe Maan2018-02-082-1/+2
| |\
| | * Add groups to OpenID Connect claimsHassan Zamani2018-02-082-1/+2
| * | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-072-1/+8
| * | Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'Kamil Trzciński2018-02-072-2/+3
| |\ \
| | * | Use `resource` in Group Variables routing schemeMatija Čupić2018-02-051-3/+1
| | * | Use `resource` in Project Variables routing schemeMatija Čupić2018-02-051-3/+1
| | * | Remove redundant routes in Groups::VariablesControllerMatija Čupić2018-02-051-4/+2
| | * | Port #save_multiple to Groups::VariablesControllerMatija Čupić2018-02-051-1/+5
| | * | Remove redundant routes in VariablesControllerMatija Čupić2018-02-051-4/+2
| | * | Stub multiple variable controller methodMatija Čupić2018-02-051-1/+6
| * | | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-061-0/+1
| * | | Added ldap config setting to lower case usernamesFrancisco Javier López2018-02-052-0/+4
| |/ /
* | | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-0526-85/+384
|\ \ \ | |/ /
| * | Allow moving wiki pages from the UIFrancisco Javier López2018-02-051-0/+82
| |/
| * Merge branch 'persistent-callouts' into 'master'Kamil Trzciński2018-02-051-0/+3
| |\
| | * Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-0212-63/+126
| | |\
| | * | Rename Callout to UserCalloutMatija Čupić2018-02-021-2/+2
| | * | Refactor CalloutsControllerMatija Čupić2018-02-021-3/+1
| | * | Move Callouts route to - pathMatija Čupić2018-01-271-5/+5
| | * | Implement Callouts controllerMatija Čupić2018-01-261-0/+5
| * | | Merge branch 'query-counts' into 'master'Rémy Coutable2018-02-051-0/+9
| |\ \ \ | | |_|/ | |/| |
| | * | Track and act upon the number of executed queriesquery-countsYorick Peterse2018-02-011-0/+9