summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* reduce karma log spamshhhhhSimon Knox2017-10-241-2/+7
* Merge branch 'remove-new-sidebar-stuff' into 'master'Phil Hughes2017-10-247-43/+37
|\
| * Rename new_sidebar in JSremove-new-sidebar-stuffAnnabel Dunstone Gray2017-10-202-5/+5
| * Remove variables from sidebar CSSAnnabel Dunstone Gray2017-10-202-22/+20
| * Replace all instances of new-sidebar with contextual-sidebarAnnabel Dunstone Gray2017-10-204-18/+14
* | Merge branch 'fix-unresolve-btn-jump-color' into 'master'Phil Hughes2017-10-242-2/+5
|\ \
| * | Fix icon color and btn-group alignment of discussion buttonsfix-unresolve-btn-jump-colorAnnabel Dunstone Gray2017-10-232-2/+5
* | | Merge branch 'sticky-perf' into 'master'Filipa Lacerda2017-10-244-10/+16
|\ \ \
| * | | fixed karma testssticky-perfPhil Hughes2017-10-231-1/+2
| * | | calculate the stickyTop instead of hard coding a variablePhil Hughes2017-10-233-4/+13
| * | | Fix performance of sticky.jsPhil Hughes2017-10-232-7/+3
* | | | Merge branch 'performance-bar-sql' into 'master'Rémy Coutable2017-10-241-2/+2
|\ \ \ \
| * | | | Remove Sherlock usage from the performance barperformance-bar-sqlYorick Peterse2017-10-231-2/+2
* | | | | Merge branch 'master' into 'master'Robert Schilling2017-10-241-1/+1
|\ \ \ \ \
| * | | | | Changing the smallest of typosLyle Kozloff2017-10-241-1/+1
* | | | | | Merge branch 'bvl-fix-qa-group-page' into 'master'Grzegorz Bizon2017-10-242-8/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use the new buttons for creating groups and projects in QA testsbvl-fix-qa-group-pageBob Van Landuyt2017-10-232-8/+10
* | | | | | Remove `<script>` and `<template>` from CHANGELOG.mdStan Hu2017-10-231-1/+1
* | | | | | Merge branch '37860-pipelines-page' into 'master'Phil Hughes2017-10-2311-83/+140
|\ \ \ \ \ \
| * | | | | | Changes after review37860-pipelines-pageFilipa Lacerda2017-10-235-3/+7
| * | | | | | Merge branch 'master' into 37860-pipelines-pageFilipa Lacerda2017-10-23307-2848/+9528
| |\ \ \ \ \ \
| * | | | | | | Fix failing testsFilipa Lacerda2017-10-192-2/+0
| * | | | | | | Make pipelines table in MR view usableFilipa Lacerda2017-10-187-81/+136
* | | | | | | | Merge branch '39299-sidebar-links' into 'master'Phil Hughes2017-10-232-11/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix button type39299-sidebar-linksFilipa Lacerda2017-10-231-1/+1
| * | | | | | | | Fix CSS in load more participantsFilipa Lacerda2017-10-232-11/+10
* | | | | | | | | Merge branch '35644-refactor-have-http-status-into-have-gitlab-http-status' i...Rémy Coutable2017-10-23179-2658/+2663
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor `have_http_status` into `have_gitlab_http_status` in the specsJacopo2017-10-20179-2658/+2663
* | | | | | | | | | Merge branch 'cs-docs-fixes' into 'master'Achilleas Pipinellis2017-10-234-8/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Simple docs fixesConnor Shea2017-10-234-8/+8
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '38869-group-files' into 'master'Phil Hughes2017-10-234-33/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removes group_avatar & group_label_subscription from global namespaceFilipa Lacerda2017-10-234-33/+20
* | | | | | | | | | | Merge branch 'docs-fix-delete-merged-branches-typo' into 'master'Achilleas Pipinellis2017-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix a small typo in the delete merged branches documentationMark Fletcher2017-10-231-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs-fix-issue-new-branch-format' into 'master'Achilleas Pipinellis2017-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix the description of the new branch created by an issue's new branch buttonMark Fletcher2017-10-231-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch '39369-document-vue-resource-http' into 'master'Phil Hughes2017-10-233-50/+76
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Moves vue resource docs into a new file.Filipa Lacerda2017-10-233-50/+76
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'backort_routes_group_routes_from_ee' into 'master'Douwe Maan2017-10-232-44/+38
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Backport EE changes to group routesbackort_routes_group_routes_from_eeValery Sizov2017-10-222-44/+38
* | | | | | | | | | | | Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'Douwe Maan2017-10-233-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Only cache the event for the fork-source when it existsbvl-fix-push-event-service-for-forksBob Van Landuyt2017-10-223-3/+7
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-escaped-text-replacement' into 'master'Filipa Lacerda2017-10-232-3/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | notes.js: use the original content when resetting the formBen Boeckel2017-10-192-2/+12
| * | | | | | | | | | | notes.js: also return the original content when getting form dataBen Boeckel2017-10-191-1/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'create-new-branch-repo-editor' into 'master'Filipa Lacerda2017-10-2310-9/+449
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Create new branch from dropdown.Jacob Schatz2017-10-2310-9/+449
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'zj-peek-gitaly' into 'master'Rémy Coutable2017-10-235-0/+56
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Add Gitaly data to the Peek performance barZeger-Jan van de Weg2017-10-235-0/+56
* | | | | | | | | | Merge branch 'add-shared-vue-loading-button' into 'master'Filipa Lacerda2017-10-237-5/+184
|\ \ \ \ \ \ \ \ \ \