summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix broken rspec tests38869-groups-selectFilipa Lacerda2017-10-242-5/+5
* Merge branch 'master' into 38869-groups-selectFilipa Lacerda2017-10-24246-2916/+3631
|\
| * Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'Filipa Lacerda2017-10-2425-52/+708
| |\
| | * Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdownph-multi-file-editor-new-file-folder-dropdownPhil Hughes2017-10-2317-12/+520
| | |\
| | * | spec fixesPhil Hughes2017-10-234-139/+146
| | * | moved to eventHub to manage creating new filesPhil Hughes2017-10-237-50/+71
| | * | fixed eslint :see_no_evil:Phil Hughes2017-10-231-3/+1
| | * | added feature specPhil Hughes2017-10-235-4/+107
| | * | fixed failing title testPhil Hughes2017-10-232-0/+2
| | * | fixed bug with tabs not switching correctlyPhil Hughes2017-10-237-13/+54
| | * | failing spec fixesPhil Hughes2017-10-236-47/+42
| | * | correctly creates file in currently viewed directoryPhil Hughes2017-10-237-4/+250
| | * | changed adding temp files/directories code to match new structurePhil Hughes2017-10-232-20/+37
| | * | fixed new file/directory modal using methods that no longer existPhil Hughes2017-10-233-46/+47
| | * | Add new files & directories in the multi-file editorPhil Hughes2017-10-2312-32/+257
| * | | Merge branch 'hide-pipeline-zero-duration' into 'master'Grzegorz Bizon2017-10-242-2/+8
| |\ \ \
| | * | | Hides pipeline duration in commit box when it is zero (nil)Guilherme Vieira2017-10-202-2/+8
| * | | | 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
| | |/ / / / / / / / / / /