summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| * | | | | | | | [Rails5] Update active_record_locking initializerblackst0ne-rails5-update-active-record-locking-initializerblackst0ne2018-03-181-52/+56
| | | | | | | | |
* | | | | | | | | Merge branch 'api-delimiter' into 'master'Robert Speicher2018-03-194-39/+44
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optional '/-/' delimiter for search API See merge request gitlab-org/gitlab-ce!17750
| * | | | | | | | | Optional '/-/' delimiter for search APIJan Provaznik2018-03-194-39/+44
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '/-/' delimiter is used only in UI, in API we don't use it for other endpoints. To align search endpoints with the rest of API endpoints, this patch makes '/-/' optional for existing endpoints (to keep backward compatibility). Documentation is updated to prefer paths without '/-/'.
* | | | | | | | | Merge branch 'jl-add-custom-metrics-docs' into 'master'Marcia Ramos2018-03-191-13/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements for prometheus metrics documentation See merge request gitlab-org/gitlab-ce!17838
| * | | | | | | | | Minor updatesjl-add-custom-metrics-docsJoshua Lambert2018-03-181-13/+17
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '43933-always-notify-mentions' into 'master'Sean McGivern2018-03-193-4/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore unsubscribed toggle for @ mentions Closes #43933 See merge request gitlab-org/gitlab-ce!17786
| * | | | | | | | | Always notify new mentions even if explicitly unsubscribed43933-always-notify-mentionsMario de la Ossa2018-03-193-4/+26
| | | | | | | | | |
* | | | | | | | | | Merge branch '44383-cleanup-framework-header' into 'master'Phil Hughes2018-03-192-56/+57
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up selectors in framework/header.scss Closes #44383 See merge request gitlab-org/gitlab-ce!17822
| * | | | | | | | | Clean up selectors in framework/header.scssTakuya Noguchi2018-03-202-56/+57
| | | | | | | | | |
* | | | | | | | | | Merge branch '44330-docs-for-ingress-ip' into 'master'Achilleas Pipinellis2018-03-192-0/+34
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add documentation for "Display ingress IP address in the Kubernetes page"" Closes #44330, #42761, and #43526 See merge request gitlab-org/gitlab-ce!17836
| * | | | | | | | | | Document static IP and DNS configuration for KubernetesAchilleas Pipinellis2018-03-191-7/+23
| | | | | | | | | | |
| * | | | | | | | | | Add documentation for displayed K8s Ingress IP address (#44330)44330-docs-for-ingress-ipDylan Griffith2018-03-192-0/+18
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'update-google-api-client' into 'master'Robert Speicher2018-03-192-5/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update google-api-client 0.13.6 -. 0.19.8 See merge request gitlab-org/gitlab-ce!17790
| * | | | | | | | | | Update google-api-clientPirate Praveen2018-03-162-5/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '44384-cleanup-css-for-nested-lists' into 'master'Filipa Lacerda2018-03-192-6/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify format for nested non-task lists Closes #44384 See merge request gitlab-org/gitlab-ce!17823
| * | | | | | | | | | Unify format for nested non-task listsTakuya Noguchi2018-03-182-6/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sh-admin-projects-remove-n-plus-one' into 'master'Robert Speicher2018-03-192-0/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove N+1 queries in /admin/projects page See merge request gitlab-org/gitlab-ce!17834
| * | | | | | | | | | Remove N+1 queries in /admin/projects pageStan Hu2018-03-192-0/+11
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'refactor/move-mr-widget-sha-mismatch-vue-component' into 'master'Clement Ho2018-03-197-26/+39
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move ShaMismatch vue component See merge request gitlab-org/gitlab-ce!17546
| * | | | | | | | | | Move ShaMismatch vue componentGeorge Tsiolis2018-03-197-26/+39
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-fix-failure-project-destroy' into 'master'Robert Speicher2018-03-192-1/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Can't modify frozen hash" error when project is destroyed See merge request gitlab-org/gitlab-ce!17816
| * | | | | | | | | | | Fix "Can't modify frozen hash" error when project is destroyedsh-fix-failure-project-destroyStan Hu2018-03-162-1/+10
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial fix to #44378
* | | | | | | | | | | Merge branch 'update-doorkeeper-openid_connect' into 'master'Douwe Maan2018-03-192-12/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update doorkeeper-openid_connect and doorkeeper See merge request gitlab-org/gitlab-ce!17797
| * | | | | | | | | | | Update doorkeeper-openid_connect and doorkeeperPirate Praveen2018-03-162-12/+13
| | |_|/ / / / / / / / | |/| | | | | | | | |