Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing request options to allow_local_requests with DELETE verblatest-security-to-master-21-03-18 | Francisco Javier López | 2018-03-21 | 1 | -1/+1 |
* | Adapting mattermost to the new way of calling HTTP | Francisco Javier López | 2018-03-21 | 1 | -1/+1 |
* | Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6' | James Lopez | 2018-03-21 | 9 | -55/+134 |
* | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6' | Douwe Maan | 2018-03-21 | 39 | -79/+408 |
* | Merge branch '39584-nesting-depth-5-framework-dropdowns' into 'master' | Clement Ho | 2018-03-21 | 2 | -4/+7 |
|\ | |||||
| * | Apply NestingDepth (level 5) (framework/dropdowns.scss) | Takuya Noguchi | 2018-03-21 | 2 | -4/+7 |
* | | Merge branch 'ide-project-avatar-identicon' into 'master' | Filipa Lacerda | 2018-03-21 | 3 | -7/+62 |
|\ \ | |||||
| * | | Changes empty project avatar to identicon in the IDE | Phil Hughes | 2018-03-21 | 3 | -7/+62 |
* | | | Merge branch 'fix-confirm-danger-modal' into 'master' | Filipa Lacerda | 2018-03-21 | 4 | -41/+32 |
|\ \ \ | |||||
| * | | | move confirm_danger_modal bindings directly into the only two pages that need itfix-confirm-danger-modal | Mike Greiling | 2018-03-20 | 4 | -10/+15 |
| * | | | refactor ConfirmDangerModal into ES module | Mike Greiling | 2018-03-20 | 2 | -37/+23 |
* | | | | Merge branch 'update-licensee' into 'master' | Douwe Maan | 2018-03-21 | 5 | -7/+7 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Fix test failures with licensee 8.9 | Pirate Praveen | 2018-03-20 | 3 | -4/+4 |
| * | | | Update licensee 8.7.0 -> 8.9 | Pirate Praveen | 2018-03-19 | 2 | -3/+3 |
* | | | | Merge branch 'update-gettext_i18n_rails_js' into 'master' | Douwe Maan | 2018-03-21 | 2 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | Update gettext_i18n_rails_js 1.2.0 -> 1.3 | Pirate Praveen | 2018-03-16 | 2 | -8/+8 |
* | | | | | Merge branch 'make-ide-ce' into 'master' | Tim Zallmann | 2018-03-21 | 120 | -167/+9213 |
|\ \ \ \ \ | |||||
| * | | | | | fixed ide_edit_button not existingmake-ide-ce | Phil Hughes | 2018-03-20 | 2 | -0/+12 |
| * | | | | | remove JS for cookie toggle | Phil Hughes | 2018-03-20 | 1 | -22/+19 |
| * | | | | | remove un-used IDE helper module | Phil Hughes | 2018-03-20 | 1 | -14/+0 |
| * | | | | | fixed SCSS lint | Phil Hughes | 2018-03-20 | 1 | -0/+7 |
| * | | | | | updated file references in specs | Phil Hughes | 2018-03-20 | 44 | -431/+632 |
| * | | | | | Move IDE to CE | Phil Hughes | 2018-03-20 | 118 | -145/+8988 |
* | | | | | | Merge branch 'sh-lograge-strip-location-header' into 'master' | Robert Speicher | 2018-03-21 | 1 | -0/+18 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Strip any query string parameters from Location headers from lograge | Stan Hu | 2018-03-20 | 1 | -0/+18 |
* | | | | | | Merge branch 'docs-fe-monitoring' into 'master' | Clement Ho | 2018-03-20 | 1 | -1/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added monitoring docs | Jose Ivan Vargas | 2018-03-20 | 1 | -1/+14 |
* | | | | | | | Merge branch 'update-spec-import-path-for-vue-mount-component-helper' into 'm... | Clement Ho | 2018-03-20 | 16 | -22/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update spec import path for vue mount component helper | George Tsiolis | 2018-03-20 | 16 | -22/+27 |
* | | | | | | | | Merge branch '42880-loss-of-input-text-on-comments-after-preview' into 'master' | Jacob Schatz | 2018-03-20 | 4 | -83/+69 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Resolve "Loss of input text on comments after preview" | Simon Knox | 2018-03-20 | 4 | -83/+69 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'fix-ci-job-auto-retry' into 'master' | Grzegorz Bizon | 2018-03-20 | 3 | -1/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add CHANGELOG entry | Tomasz Maczukin | 2018-03-20 | 1 | -0/+5 |
| * | | | | | | | | Prevent auto-retry AccessDenied error from stopping transition to failed | Tomasz Maczukin | 2018-03-20 | 2 | -1/+34 |
* | | | | | | | | | Merge branch 'qa/gb/fix-rebase-specs' into 'master' | Robert Speicher | 2018-03-20 | 1 | -8/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix end-to-end specs for rebasing a merge requestqa/gb/fix-rebase-specs | Grzegorz Bizon | 2018-03-20 | 1 | -8/+9 |
* | | | | | | | | | | Merge branch 'jramsay-maintainers-can-edit-docs' into 'master' | Marcia Ramos | 2018-03-20 | 1 | -4/+9 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Update merge request maintainer access docs | James Ramsay | 2018-03-20 | 1 | -4/+9 |
* | | | | | | | | | | Merge branch 'update-cloud-native-chart-docs' into 'master' | Marcia Ramos | 2018-03-20 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Update cloud native charts docsupdate-cloud-native-chart-docs | Joshua Lambert | 2018-03-20 | 1 | -2/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '44232-docs-for-runner-ip-address' into 'master'5158-metrics-alerting-ce | Kamil Trzciński | 2018-03-20 | 4 | -0/+38 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add documentation for runner IP address (#44232)44232-docs-for-runner-ip-address | Dylan Griffith | 2018-03-19 | 4 | -0/+38 |
* | | | | | | | | | | Merge branch '44388-update-rack-protection-to-2-0-1' into 'master' | Grzegorz Bizon | 2018-03-20 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Update rack-protection to 2.0.1 | Takuya Noguchi | 2018-03-19 | 2 | -1/+6 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/sm/erase_old_trace' into 'master' | Kamil Trzciński | 2018-03-20 | 2 | -2/+23 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Use update_column than write_attribute and savefix/sm/erase_old_trace | Shinya Maeda | 2018-03-19 | 2 | -2/+23 |
* | | | | | | | | | Merge branch '42558-add-monitoring-no-data-empty-state' into 'master' | Phil Hughes | 2018-03-20 | 5 | -35/+24 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix tests for dahboard.vue42558-add-monitoring-no-data-empty-state | Mike Greiling | 2018-03-19 | 2 | -34/+13 |
| * | | | | | | | | | add no_data illustration to monitoring empty state | Mike Greiling | 2018-03-19 | 3 | -1/+11 |
* | | | | | | | | | | Merge branch '44280-fix-code-search' into 'master' | Sean McGivern | 2018-03-20 | 4 | -7/+24 |
|\ \ \ \ \ \ \ \ \ \ |