summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Propagate variable id to all duplicates42930-removing-and-adding-a-variable-gives-an-error-hard-to-understandMatija Čupić2018-02-281-1/+1
* Group variables by key and environment_scopeMatija Čupić2018-02-281-1/+1
* Add CHANGELOGMatija Čupić2018-02-261-0/+6
* Add spec for CiVariables controller concernMatija Čupić2018-02-261-0/+73
* Use CI variable filtering in Groups::VariablesControllerMatija Čupić2018-02-251-2/+4
* Extract CI variable params filtering to concernMatija Čupić2018-02-252-14/+19
* Implement variable params filtering for Projects::VariablesControllerMatija Čupić2018-02-252-1/+40
* Update CHANGELOG.md for 10.5.2Ian Baum2018-02-2513-60/+21
* Merge branch 'backport-qa_78' into 'master'Grzegorz Bizon2018-02-2515-13/+167
|\
| * Fix specsbackport-qa_78Felipe Artur2018-02-231-1/+2
| * Small review changesFelipe Artur2018-02-222-2/+2
| * test merge request rebaseFelipe Artur2018-02-1915-14/+167
* | Merge branch 'minimal-fix-for-artifacts-service' into 'master'Grzegorz Bizon2018-02-243-18/+63
|\ \
| * | Revert "Revert "Use Dir.mktmpdir""Shinya Maeda2018-02-241-15/+14
| * | Revert "Use Dir.mktmpdir"minimal-fix-for-artifacts-serviceShinya Maeda2018-02-241-14/+15
| * | Use Dir.mktmpdirShinya Maeda2018-02-241-15/+14
| * | Change FileUtils.cp to FileUtils.copyShinya Maeda2018-02-241-1/+1
| * | Bring back the initial commitShinya Maeda2018-02-242-25/+14
| * | Add chnagelogShinya Maeda2018-02-241-0/+5
| * | Fixed static analysysShinya Maeda2018-02-242-6/+6
| * | Check if the latest permanent file exists before remove file. Add tests.Shinya Maeda2018-02-232-16/+31
| * | Copy original file to temp file always to prevent data lossShinya Maeda2018-02-232-17/+33
| * | Minimal fix for artifacts serviceKamil Trzciński2018-02-231-5/+26
* | | Merge branch 'refactor/move-filtered-search-vue-component' into 'master'Clement Ho2018-02-246-108/+114
|\ \ \
| * | | Move RecentSearchesDropdownContent vue componentGeorge Tsiolis2018-02-226-108/+114
* | | | Merge branch '43570-localstorage-clear-error-when-feature-test-fails-before-v...Stan Hu2018-02-231-2/+4
|\ \ \ \
| * | | | prevent localStorage.clear from running when it would cause an errorMike Greiling2018-02-231-2/+4
* | | | | Merge branch 'mk/fix-pg-undefined-table-untracked_files_for_uploads-does-not-...Stan Hu2018-02-231-2/+2
|\ \ \ \ \
| * | | | | Fix deletion attempts on dropped tablesMichael Kozono2018-02-231-2/+2
| |/ / / /
* | | | | Merge branch 'boards-bundle-refactor' into 'master'Jacob Schatz2018-02-235-5/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into 'boards-bundle-refactor'Jacob Schatz2018-02-23550-3226/+7463
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master'Jacob Schatz2018-02-234-5/+7
|\ \ \ \ \
| * | | | | Removed webpack tagConstance Okoghenun2018-02-231-1/+0
| * | | | | Refactored webpack bundle tag for deploy keysproject-deploy-keys-bundle-tag-refactorConstance Okoghenun2018-02-233-4/+7
* | | | | | 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-233-5/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | remove issue_show webpack bundle in favor of pages/projects/issues/show/index.jsremove-issues-showMike Greiling2018-02-233-5/+1
* | | | | | | Merge branch 'backport_custom_metrics_ce_components' into 'master'Robert Speicher2018-02-2316-92/+111
|\ \ \ \ \ \ \
| * | | | | | | Backport custom metrics ce componentsPaweł Chojnacki2018-02-2316-92/+111
|/ / / / / / /
* | | | | | | Merge branch '29497-pages-custom-domain-dns-verification' into 'master'Robert Speicher2018-02-2352-22/+1358
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into '29497-pages-custom-domain-dns-verification'Robert Speicher2018-02-2325-119/+225
| |\ \ \ \ \ \ \
| * | | | | | | | Log pages domain verification changes to application.logNick Thomas2018-02-231-0/+1
| * | | | | | | | Add DNS verification to Pages custom domainsNick Thomas2018-02-2352-22/+1357
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '42044-osw-add-button-to-deploy-runner-to-kubernetes' into 'master'Filipa Lacerda2018-02-2310-25/+71
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add a button to deploy a runner to a Kubernetes cluster in the settings page42044-osw-add-button-to-deploy-runner-to-kubernetesOswaldo Ferreira2018-02-2310-25/+71
* | | | | | | | Merge branch 'docs-fix-empty-line' into 'master'Jacob Schatz2018-02-231-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add missing empty line at the end of filedocs-fix-empty-lineClement Ho2018-02-221-3/+3
* | | | | | | | Merge branch 'dispatcher-if' into 'master'Mike Greiling2018-02-231-24/+27
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Convert switch into if statementdispatcher-ifClement Ho2018-02-221-24/+27
View Lorry Controller Status