summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updating the backported file.7731-feature-flags-table-view-filter-tabsScott Hampton2019-01-041-6/+3
* Backporting a change in EEScott Hampton2019-01-041-4/+12
* Merge branch 'support-new-syntax-for-common-vulnerabilities' into 'master'Kamil Trzciński2019-01-0410-2386/+3987
|\
| * Support new report syntax for common vulnerabilitiesKamil Trzciński2019-01-0410-2386/+3987
* | Merge branch 'docs-serverless-yml-update' into 'master'Marcia Ramos2019-01-041-9/+6
|\ \
| * | Update serverless extension to ymldanielgruesso2019-01-041-9/+6
|/ /
* | Merge branch 'docs-fix-broken-link' into 'master'Mike Lewis2019-01-041-1/+1
|\ \
| * | Fixes broken linkMarcia Ramos2019-01-041-1/+1
| |/
* | Merge branch 'deprecated-callback-false' into 'master'Robert Speicher2019-01-043-4/+7
|\ \ | |/ |/|
| * Fix deprecation: returning false in Active Record and Active Model callbacks ...Jasper Maes2019-01-033-4/+7
* | Merge branch 'docs/add-source-code-permissions' into 'master'Marcia Ramos2019-01-041-0/+1
|\ \
| * | Add project code view permissionsdocs/add-source-code-permissionsCindy Pallares 🦉2019-01-041-0/+1
* | | Merge branch 'do-not-ignore-schema-conflicts' into 'master'Robert Speicher2019-01-041-1/+1
|\ \ \
| * | | Don't ignore conflicts in db/schema.rbdo-not-ignore-schema-conflictsYorick Peterse2019-01-041-1/+1
* | | | Merge branch 'feature/gb/expose-ci-api-url-variable' into 'master'Douwe Maan2019-01-048-2/+114
|\ \ \ \ | |_|/ / |/| | |
| * | | Improve readablity of CI_API_V4_URL related codeGrzegorz Bizon2019-01-043-5/+3
| * | | Minor improvements to CI_API_V4_URL variable exposurefeature/gb/expose-ci-api-url-variableGrzegorz Bizon2019-01-033-3/+3
| * | | Add new docs for CI_API_V4_URL CI/CD variableGrzegorz Bizon2019-01-031-1/+2
| * | | Add changelog for new predefined CI/CD variableGrzegorz Bizon2019-01-031-0/+5
| * | | Expose CI_API_V4_URL predefined CI/CD variableGrzegorz Bizon2019-01-032-1/+2
| * | | Add API::Helpers::Version and expose API root URLGrzegorz Bizon2019-01-036-25/+88
| * | | Expose method that returns GitLab API pathsGrzegorz Bizon2019-01-032-0/+44
* | | | Merge branch 'docs-fix-only-except-default' into 'master'Marcia Ramos2019-01-041-2/+2
|\ \ \ \
| * | | | Improve documentation about only except default valuesdocs-fix-only-except-defaultShinya Maeda2018-12-241-2/+2
* | | | | Merge branch 'include-templates' into 'master'Kamil Trzciński2019-01-0416-65/+468
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Allow to include templatesKamil Trzciński2019-01-0416-65/+468
* | | | | Merge branch 'bvl-dont-ignore-gitlab-pot-compat-check' into 'master'Yorick Peterse2019-01-041-1/+1
|\ \ \ \ \
| * | | | | Don't ingore the `gitlab.pot` in ee_compat_checkBob Van Landuyt2019-01-041-1/+1
* | | | | | Merge branch 'contacted_at' into 'master'Stan Hu2019-01-045-2/+62
|\ \ \ \ \ \
| * | | | | | Take contacted_at value from the DB when it is about to be displayed in the W...Alexander Kutelev2019-01-045-2/+62
* | | | | | | Merge branch 'docs-releases-api' into 'master'Marcia Ramos2019-01-045-10/+545
|\ \ \ \ \ \ \
| * | | | | | | Documentation for Release page MVCFilipa Lacerda - 🎄🎄 OOO - Back on January 7th - 🎄🎄2019-01-045-10/+545
|/ / / / / / /
* | | | | | | Merge branch 'ac-releases-api-with-assets' into 'master'Kamil Trzciński2019-01-0419-4/+447
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Change release links table ID to bigserialac-releases-api-with-assetsShinya Maeda2019-01-042-2/+2
| * | | | | | Use AR releation "count" methodShinya Maeda2019-01-041-1/+1
| * | | | | | Add sequence to release link factoryShinya Maeda2019-01-041-2/+2
| * | | | | | Add frozen_string_literal: trueShinya Maeda2019-01-043-0/+6
| * | | | | | Add unique constraint to release and urlShinya Maeda2019-01-048-110/+28
| * | | | | | Add spec for duplicate link name creationShinya Maeda2019-01-042-23/+34
| * | | | | | Add spec for Releases::Source and Link modelsShinya Maeda2019-01-046-3/+136
| * | | | | | Update safe model attributes for import/exportShinya Maeda2019-01-041-0/+7
| * | | | | | Support CURD operation for release asset linksShinya Maeda2019-01-0415-3/+371
* | | | | | | Merge branch 'link-new-openshift-template' into 'master'Achilleas Pipinellis2019-01-041-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Mark references to openshift template as deprecatedBalasankar "Balu" C2019-01-041-0/+6
|/ / / / / / /
* | | | | | | Merge branch 'leipert-forward-gitlab-svgs' into 'master'Clement Ho2019-01-042-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update @gitlab/svgs to latest versionLukas Eipert2019-01-042-5/+5
* | | | | | | Merge branch '55853-deprecate-ci-autodeploy-quick_start_guide-html-docs' into...Achilleas Pipinellis2019-01-048-95/+1
|\ \ \ \ \ \ \
| * | | | | | | Deprecate Auto Deploy's quick start guide55853-deprecate-ci-autodeploy-quick_start_guide-html-docsTakuya Noguchi2019-01-028-95/+1
* | | | | | | | Merge branch 'mj/process-feature-freeze' into 'master'Yorick Peterse2019-01-041-4/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Change the wording on branch feature freezemj/process-feature-freezeMarin Jankovski2018-12-141-6/+5