summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Replace `features/project/merge_requests/references.featue`blackst0ne-replace-spinach-project-merge-requests-references.featureblackst0ne2018-05-106-131/+60
* Add changelog entry [ci skip]blackst0ne2018-05-101-0/+5
* Merge branch 'blackst0ne-replace-spinach-project-issues-references.feature' i...Robert Speicher2018-05-096-254/+272
|\
| * Replace the `project/issues/references.feature` spinach test with an rspec an...blackst0ne2018-05-096-254/+272
|/
* Merge branch 'blackst0ne-replace-spinach-project-deploy-keys.feature' into 'm...Robert Speicher2018-05-095-144/+130
|\
| * Replace the `project/deploy_keys.feature` spinach test with an rspec analogblackst0ne2018-05-095-144/+130
|/
* Merge branch '46032/cycle-analytics-service-axios' into 'master'Clement Ho2018-05-092-15/+17
|\
| * refactor 'cycle_analytics' to use axiosPaul Slaughter2018-05-092-15/+17
|/
* Merge branch 'dm-repository-xcode-project' into 'master'Robert Speicher2018-05-093-3/+41
|\
| * Add Repository#xcode_project? methodDouwe Maan2018-05-093-3/+41
* | Merge branch '46032/deploy-keys-axios' into 'master'Clement Ho2018-05-094-40/+24
|\ \
| * | refactor "deploy_keys" to use axiosPaul Slaughter2018-05-094-40/+24
|/ /
* | Merge branch 'fix-project-mirror-data-schema' into 'master'Douwe Maan2018-05-095-2/+78
|\ \
| * \ Merge branch 'master' into 'fix-project-mirror-data-schema'Douwe Maan2018-05-09197-1728/+1367
| |\ \
| * | | Adds changelogTiago Botelho2018-05-081-0/+6
| * | | Adds unique constraint to ProjectMirrorData project_id indexTiago Botelho2018-05-082-2/+33
| * | | Adds not null constraint to ProjectMirrorData's foreign_key project_idTiago Botelho2018-05-083-2/+41
* | | | Merge branch 'jivl-delete-d3-rails-gem' into 'master'Douwe Maan2018-05-092-6/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Removed the d3_rails gemJose2018-05-092-6/+0
* | | | Merge branch 'docs/bdo-inclusive-language-groups-docs' into 'master'🚄 Job van der Voort 🚀2018-05-091-10/+10
|\ \ \ \
| * | | | Update documentation to use inclusive language, gender neutral name and pronoun.Brendan O'Leary 🐢2018-05-091-10/+10
* | | | | Merge branch '45840-fix-cache-key-docs' into 'master'Achilleas Pipinellis2018-05-091-7/+11
|\ \ \ \ \
| * | | | | Fix cache:key documentation for the default valueLin Jen-Shin2018-05-091-7/+11
* | | | | | Merge branch 'docs-fix-duplicate-titles' into 'master'Achilleas Pipinellis2018-05-0920-109/+52
|\ \ \ \ \ \
| * | | | | | Docs: fix duplicate titlesMarcia Ramos 🚫 (OOO - back on May 21)2018-05-0920-109/+52
|/ / / / / /
* | | | | | Merge branch 'fix/gb/add-missing-foreign-key-to-database-schema' into 'master'Kamil Trzciński2018-05-091-0/+1
|\ \ \ \ \ \
| * | | | | | Add missing pipeline build foreign key to the schemaGrzegorz Bizon2018-05-091-0/+1
* | | | | | | Merge branch 'fix/gb/add-tmp-index-to-improve-stages-migration-cleanup' into ...Kamil Trzciński2018-05-091-1/+34
|\ \ \ \ \ \ \
| * | | | | | | Add tmp index to ci_builds to optimize stages migrationGrzegorz Bizon2018-05-091-1/+34
| |/ / / / / /
* | | | | | | Merge branch 'zj-remove-rugged-call' into 'master'Robert Speicher2018-05-091-7/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove rugged call in blame controllerZeger-Jan van de Weg2018-05-081-7/+3
* | | | | | | Merge branch 'docs-update-docstyleguide' into 'master'Achilleas Pipinellis2018-05-091-23/+91
|\ \ \ \ \ \ \
| * | | | | | | Docs: update docs style guidelinesMarcia Ramos 🚫 (OOO - back on May 21)2018-05-091-23/+91
|/ / / / / / /
* | | | | | | Merge branch 'support-active-setting-while-registering-a-runner' into 'master'Kamil Trzciński2018-05-093-1/+30
|\ \ \ \ \ \ \
| * | | | | | | Add CHANGELOG entryTomasz Maczukin2018-05-091-0/+5
| * | | | | | | Support 'active' setting on Runner Registration API endpointTomasz Maczukin2018-05-092-1/+25
* | | | | | | | Merge branch '46003-fix-node-10-compatibility' into 'master'Mike Greiling2018-05-091-23/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | bump upath dependency to a version compatible with node 10Mike Greiling2018-05-091-23/+2
* | | | | | | | | Merge branch '46010-runner-type-not-null' into 'master'Kamil Trzciński2018-05-095-2/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add validation Ci::Runner runner_type must be presentDylan Griffith2018-05-092-0/+2
| * | | | | | | | | Add DB constraint ci_runners.runner_type not nullDylan Griffith2018-05-093-2/+13
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-ide-empty-editor' into 'master'Filipa Lacerda2018-05-094-3/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | added specsPhil Hughes2018-05-092-0/+20
| * | | | | | | | | Fixed empty editors in the IDEPhil Hughes2018-05-092-3/+5
* | | | | | | | | | Merge branch '10-8-dependencies-update' into 'master'James Lopez2018-05-091-162/+234
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update the dependencies license listFilipa Lacerda2018-05-091-162/+234
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '10-8-update-gitignore' into 'master'James Lopez2018-05-0912-15/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update the .gitignore, .gitlab-ci.yml, and Dockerfile templatesFilipa Lacerda2018-05-0912-15/+27
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'cherry-pick-7b8d754e-ce' into 'master'Grzegorz Bizon2018-05-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Adjust spec to build correct path when storage path ends in slashDouwe Maan2018-05-091-1/+1
| | |/ / / / / / / | |/| | | | | | |
View Lorry Controller Status