summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | 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
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '44232-docs-for-runner-ip-address' into 'master'5158-metrics-alerting-ceKamil Trzciński2018-03-204-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add documentation for "Display IP Address Of Runner On Runner Page"" Closes #44232 See merge request gitlab-org/gitlab-ce!17837
| * | | | | | | | | | | | | | 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.1 Closes #44388 See merge request gitlab-org/gitlab-ce!17835
| * | | | | | | | | | | | | | 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 save Closes #44366 See merge request gitlab-org/gitlab-ce!17861
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Prometheus graphs have no empty state when no data is present" Closes #42558 See merge request gitlab-org/gitlab-ce!17759
| * | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Search code blob sometimes shows filename and branch" Closes #44280 See merge request gitlab-org/gitlab-ce!17777
| * | | | | | | | | | | | | | | Split repository search result on \n instead of $ to prevent the items of ↵Jasper Maes2018-03-194-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the array to start with a newline. Remove the strip from parsing the search result to keep result endlines.
* | | | | | | | | | | | | | | | Merge branch 'issue_25542' into 'master'Sean McGivern2018-03-208-29/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve JIRA event descriptions Closes #25542 See merge request gitlab-org/gitlab-ce!17811
| * | | | | | | | | | | | | | | | Improve JIRA event descriptionsissue_25542Felipe Artur2018-03-198-29/+88
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rs-twitter-helper' into 'master'Douwe Maan2018-03-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `www.` from `twitter_url` helper See merge request gitlab-org/gitlab-ce!17872
| * | | | | | | | | | | | | | | Remove `www.` from `twitter_url` helperrs-twitter-helperRobert Speicher2018-03-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twitter redirects `www.twitter.com` to `twitter.com` Also removes unnecessary regex escapes, just 'cause.
* | | | | | | | | | | | | | | | Merge branch 'move-render-gfm' into 'master'Mike Greiling2018-03-2015-22/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move render gfm to commons and update imports See merge request gitlab-org/gitlab-ce!15993
| * | | | | | | | | | | | | | | move render_gfm into behaviors directoryMike Greiling2018-03-1915-22/+20
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ajax-requests-in-performance-bar' into 'master'Robert Speicher2018-03-1930-212/+807
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Ajax requests in performance bar Closes #43925 See merge request gitlab-org/gitlab-ce!17742
| * | | | | | | | | | | | | | | Show Ajax requests in performance barSean McGivern2018-03-1930-212/+807
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But first, rewrite the performance bar in Vue: 1. Remove the peek-host gem and replace it with existing code. This also allows us to include the host in the JSON response, rather than in the page HTML. 2. Leave the line profiler parts as here-be-dragons: nicer would be a separate endpoint for these, so we could use them on Ajax requests too. 3. The performance bar is too fiddly to rewrite right now, so apply the same logic to that. Then, add features! All requests made through Axios are able to be tracked. To keep a lid on memory usage, only the first two requests for a given URL are tracked, though. Each request that's tracked has the same data as the initial page load, with the exception of the performance bar and the line profiler, as explained above.
* | | | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-update-active-record-locking-initializer' ↵Robert Speicher2018-03-191-52/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' [Rails5] Update active_record_locking initializer See merge request gitlab-org/gitlab-ce!17824