summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix N+1 in `MergeRequest#merge_request_diff_for`reduce-query-count-for-mergerequestscontroller-showSean McGivern2018-03-213-10/+33
* 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
|\ \ \ \ \ \
| * | | | | | Split repository search result on \n instead of $ to prevent the items of the...Jasper Maes2018-03-194-7/+24
* | | | | | | Merge branch 'issue_25542' into 'master'Sean McGivern2018-03-208-29/+88
|\ \ \ \ \ \ \
| * | | | | | | 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` helperrs-twitter-helperRobert Speicher2018-03-191-3/+3
* | | | | | | | Merge branch 'move-render-gfm' into 'master'Mike Greiling2018-03-2015-22/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 barSean McGivern2018-03-1930-212/+807
* | | | | | | | | Merge branch 'blackst0ne-rails5-update-active-record-locking-initializer' int...Robert Speicher2018-03-191-52/+56
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | [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 APIJan Provaznik2018-03-194-39/+44
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jl-add-custom-metrics-docs' into 'master'Marcia Ramos2018-03-191-13/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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.scssTakuya Noguchi2018-03-202-56/+57
* | | | | | | | | | Merge branch '44330-docs-for-ingress-ip' into 'master'Achilleas Pipinellis2018-03-192-0/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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-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 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 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 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 destroyedsh-fix-failure-project-destroyStan Hu2018-03-162-1/+10
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'update-doorkeeper-openid_connect' into 'master'Douwe Maan2018-03-192-12/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update doorkeeper-openid_connect and doorkeeperPirate Praveen2018-03-162-12/+13
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'remove-oj' into 'master'Robert Speicher2018-03-192-5/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove oj as we're not using itLin Jen-Shin2018-03-192-5/+0
* | | | | | | | | | | | Merge branch '43928-merge-request-comment-gets-cleared-once-the-previous-comm...Filipa Lacerda2018-03-191-9/+3
|\ \ \ \ \ \ \ \ \ \ \ \