summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixing request options to allow_local_requests with DELETE verblatest-security-to-master-21-03-18Francisco Javier López2018-03-211-1/+1
* Adapting mattermost to the new way of calling HTTPFrancisco Javier López2018-03-211-1/+1
* Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'James Lopez2018-03-219-55/+134
* Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-2139-79/+408
* Merge branch '39584-nesting-depth-5-framework-dropdowns' into 'master'Clement Ho2018-03-212-4/+7
|\
| * Apply NestingDepth (level 5) (framework/dropdowns.scss)Takuya Noguchi2018-03-212-4/+7
* | Merge branch 'ide-project-avatar-identicon' into 'master'Filipa Lacerda2018-03-213-7/+62
|\ \
| * | Changes empty project avatar to identicon in the IDEPhil Hughes2018-03-213-7/+62
* | | Merge branch 'fix-confirm-danger-modal' into 'master'Filipa Lacerda2018-03-214-41/+32
|\ \ \
| * | | move confirm_danger_modal bindings directly into the only two pages that need itfix-confirm-danger-modalMike Greiling2018-03-204-10/+15
| * | | refactor ConfirmDangerModal into ES moduleMike Greiling2018-03-202-37/+23
* | | | Merge branch 'update-licensee' into 'master'Douwe Maan2018-03-215-7/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix test failures with licensee 8.9Pirate Praveen2018-03-203-4/+4
| * | | Update licensee 8.7.0 -> 8.9Pirate Praveen2018-03-192-3/+3
* | | | Merge branch 'update-gettext_i18n_rails_js' into 'master'Douwe Maan2018-03-212-6/+6
|\ \ \ \
| * | | | Update gettext_i18n_rails_js 1.2.0 -> 1.3Pirate Praveen2018-03-162-8/+8
* | | | | Merge branch 'make-ide-ce' into 'master'Tim Zallmann2018-03-21120-167/+9213
|\ \ \ \ \
| * | | | | fixed ide_edit_button not existingmake-ide-cePhil Hughes2018-03-202-0/+12
| * | | | | remove JS for cookie togglePhil Hughes2018-03-201-22/+19
| * | | | | remove un-used IDE helper modulePhil Hughes2018-03-201-14/+0
| * | | | | fixed SCSS lintPhil Hughes2018-03-201-0/+7
| * | | | | updated file references in specsPhil Hughes2018-03-2044-431/+632
| * | | | | Move IDE to CEPhil Hughes2018-03-20118-145/+8988
* | | | | | Merge branch 'sh-lograge-strip-location-header' into 'master'Robert Speicher2018-03-211-0/+18
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Strip any query string parameters from Location headers from logrageStan Hu2018-03-201-0/+18
* | | | | | Merge branch 'docs-fe-monitoring' into 'master'Clement Ho2018-03-201-1/+14
|\ \ \ \ \ \
| * | | | | | Added monitoring docsJose Ivan Vargas2018-03-201-1/+14
* | | | | | | Merge branch 'update-spec-import-path-for-vue-mount-component-helper' into 'm...Clement Ho2018-03-2016-22/+27
|\ \ \ \ \ \ \
| * | | | | | | Update spec import path for vue mount component helperGeorge Tsiolis2018-03-2016-22/+27
* | | | | | | | Merge branch '42880-loss-of-input-text-on-comments-after-preview' into 'master'Jacob Schatz2018-03-204-83/+69
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "Loss of input text on comments after preview"Simon Knox2018-03-204-83/+69
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-ci-job-auto-retry' into 'master'Grzegorz Bizon2018-03-203-1/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Add CHANGELOG entryTomasz Maczukin2018-03-201-0/+5
| * | | | | | | | Prevent auto-retry AccessDenied error from stopping transition to failedTomasz Maczukin2018-03-202-1/+34
* | | | | | | | | Merge branch 'qa/gb/fix-rebase-specs' into 'master'Robert Speicher2018-03-201-8/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix end-to-end specs for rebasing a merge requestqa/gb/fix-rebase-specsGrzegorz Bizon2018-03-201-8/+9
* | | | | | | | | | Merge branch 'jramsay-maintainers-can-edit-docs' into 'master'Marcia Ramos2018-03-201-4/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Update merge request maintainer access docsJames Ramsay2018-03-201-4/+9
* | | | | | | | | | Merge branch 'update-cloud-native-chart-docs' into 'master'Marcia Ramos2018-03-201-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Update cloud native charts docsupdate-cloud-native-chart-docsJoshua Lambert2018-03-201-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '44232-docs-for-runner-ip-address' into 'master'5158-metrics-alerting-ceKamil Trzciński2018-03-204-0/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add documentation for runner IP address (#44232)44232-docs-for-runner-ip-addressDylan Griffith2018-03-194-0/+38
* | | | | | | | | | Merge branch '44388-update-rack-protection-to-2-0-1' into 'master'Grzegorz Bizon2018-03-202-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Update rack-protection to 2.0.1Takuya Noguchi2018-03-192-1/+6
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix/sm/erase_old_trace' into 'master'Kamil Trzciński2018-03-202-2/+23
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Use update_column than write_attribute and savefix/sm/erase_old_traceShinya Maeda2018-03-192-2/+23
* | | | | | | | | Merge branch '42558-add-monitoring-no-data-empty-state' into 'master'Phil Hughes2018-03-205-35/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix tests for dahboard.vue42558-add-monitoring-no-data-empty-stateMike Greiling2018-03-192-34/+13
| * | | | | | | | | add no_data illustration to monitoring empty stateMike Greiling2018-03-193-1/+11
* | | | | | | | | | Merge branch '44280-fix-code-search' into 'master'Sean McGivern2018-03-204-7/+24
|\ \ \ \ \ \ \ \ \ \