summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fixed eslintperformance-bar-vue-resourcePhil Hughes2018-03-211-1/+0
|
* Add Vue resource interceptor to performance barPhil Hughes2018-03-212-0/+26
|
* Merge branch 'gitaly-upload-archive' into 'master'Sean McGivern2018-03-213-2/+8
|\ | | | | | | | | | | | | Send Gitaly payload for git-upload-archive SSH commands Closes gitaly#1092 See merge request gitlab-org/gitlab-ce!17903
| * Send Gitaly payload for git-upload-archive SSH commandsAlejandro Rodríguez2018-03-213-2/+8
| |
* | Merge branch 'ab-44446-add-indexes-for-user-activity-queries' into 'master'Yorick Peterse2018-03-213-1/+48
|\ \ | | | | | | | | | | | | | | | | | | Add indexes for user activity queries. Closes #44446 See merge request gitlab-org/gitlab-ce!17890
| * | Guard creation/removal with existence checks.Andreas Brandl2018-03-211-6/+16
| | |
| * | Flip column order in new index.Andreas Brandl2018-03-212-3/+3
| | |
| * | Patch MySQL's odd foreign key behavior.Andreas Brandl2018-03-211-1/+14
| | |
| * | Add indexes for user activity queries.Andreas Brandl2018-03-213-1/+25
| | | | | | | | | | | | Closes #44446.
* | | Merge branch 'flip-carets' into 'master'Phil Hughes2018-03-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | makes caret go to the right side when closing most right issueboard list Closes #40913 See merge request gitlab-org/gitlab-ce!17773
| * | | makes caret go to the right side when closing most right issueboard listflip-caretsDimitrie Hoekstra2018-03-151-1/+1
| | | |
* | | | Merge branch 'ab-43887-concurrent-migration-helpers' into 'master'Yorick Peterse2018-03-217-62/+163
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convenient use of concurrent migration helpers Closes #43887 See merge request gitlab-org/gitlab-ce!17888
| * | | | Shortcut concurrent foreign key creation if already exists.ab-43887-concurrent-migration-helpersAndreas Brandl2018-03-206-51/+92
| | | | | | | | | | | | | | | | | | | | Closes #43887.
| * | | | Shortcut concurrent index creation/removal if no effect.Andreas Brandl2018-03-203-11/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Index creation does not have an effect if the index is present already. Index removal does not have an affect if the index is not present. This helps to avoid patterns like this in migrations: ``` if index_exists?(...) remove_concurrent_index(...) end ```
* | | | | Merge branch '39584-nesting-depth-5-framework-dropdowns' into 'master'Clement Ho2018-03-212-4/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | NestingDepth (level 5) in framework/dropdowns.scss See merge request gitlab-org/gitlab-ce!17820
| * | | | 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 IDE Closes #44298 See merge request gitlab-org/gitlab-ce!17899
| * | | | | Changes empty project avatar to identicon in the IDEPhil Hughes2018-03-213-7/+62
| | |_|_|/ | |/| | | | | | | | | | | | | Closes #44298
* | | | | Merge branch 'fix-confirm-danger-modal' into 'master'Filipa Lacerda2018-03-214-41/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor ConfirmDangerModal into ES module See merge request gitlab-org/gitlab-ce!17874
| * | | | | 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update licensee 8.7.0 -> 8.9 Closes #18077 See merge request gitlab-org/gitlab-ce!17719
| * | | | | 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.3 See merge request gitlab-org/gitlab-ce!17801
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move IDE to CE Closes #44157 See merge request gitlab-org/gitlab-ce!17887
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also makes the IDE generally available
* | | | | | | | Merge branch 'sh-lograge-strip-location-header' into 'master'Robert Speicher2018-03-211-0/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Strip any query string parameters from Location headers from lograge See merge request gitlab-org/gitlab-ce!17895
| * | | | | | | Strip any query string parameters from Location headers from logrageStan Hu2018-03-201-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of https://github.com/roidrage/lograge/pull/241
* | | | | | | | Merge branch 'docs-fe-monitoring' into 'master'Clement Ho2018-03-201-1/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add performance monitoring docs for the new FE guide See merge request gitlab-org/gitlab-ce!17809
| * | | | | | | | Added monitoring docsJose Ivan Vargas2018-03-201-1/+14
| | | | | | | | |
* | | | | | | | | Merge branch 'update-spec-import-path-for-vue-mount-component-helper' into ↵Clement Ho2018-03-2016-22/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update spec import path for vue mount component helper See merge request gitlab-org/gitlab-ce!17880
| * | | | | | | | | 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" Closes #42880 See merge request gitlab-org/gitlab-ce!17076
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent auto-retry AccessDenied error from stopping transition to failed See merge request gitlab-org/gitlab-ce!17862
| * | | | | | | | | | 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 request Closes gitlab-qa#208 See merge request gitlab-org/gitlab-ce!17885
| * | | | | | | | | | 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 docs See merge request gitlab-org/gitlab-ce!17864
| * | | | | | | | | | 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 Helm chart docs for alpha See merge request gitlab-org/gitlab-ce!17875
| * | | | | | | | | | Update cloud native charts docsupdate-cloud-native-chart-docsJoshua Lambert2018-03-201-2/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |