summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Pass git object dir attributes as relative paths to Gitalyfix/pass-git-object-dir-attrs-as-relativeAhmad Sherif2017-10-117-30/+69
* Merge branch 'gitaly-has-local-branches' into 'master'Rémy Coutable2017-10-114-9/+19
|\
| * Use Gitaly's RepositoryService.HasLocalBranches RPCgitaly-has-local-branchesAlejandro Rodríguez2017-10-104-9/+19
* | Merge branch '38720-sort-admin-runners' into 'master'Rémy Coutable2017-10-113-2/+8
|\ \
| * | Add sort runners on admin runnersTakuya Noguchi2017-10-043-2/+8
* | | Merge branch 'fix/sm/move-callback-route-google_api-auth-callback-for-oauth-u...Kamil Trzciński2017-10-112-4/+5
|\ \ \
| * | | Remove unnecessary TOLLEVEL routes from path_regex.rbfix/sm/move-callback-route-google_api-auth-callback-for-oauth-underShinya Maeda2017-10-111-1/+0
| * | | Add - before google_api/auth/callbackShinya Maeda2017-10-111-3/+5
* | | | Merge branch '37399-simplify-project-page' into 'master'Phil Hughes2017-10-1118-187/+313
|\ \ \ \
| * | | | Simplify project pageAnnabel Dunstone Gray2017-10-1118-187/+313
|/ / / /
* | | | Merge branch 'milestones-permissions-docs' into 'master'Sean McGivern2017-10-111-1/+2
|\ \ \ \
| * | | | Developer can create/edit/delete milestonesVictor Wu2017-10-111-1/+2
|/ / / /
* | | | Merge branch 'rc-change-qa-namespace' into 'master'Grzegorz Bizon2017-10-111-1/+1
|\ \ \ \
| * | | | QA group name, use hyphens rather than underscoresRichard Clamp2017-10-101-1/+1
* | | | | Merge branch '38869-start' into 'master'Phil Hughes2017-10-112-20/+21
|\ \ \ \ \
| * | | | | Enable eslint in star and remove from main.jsFilipa Lacerda2017-10-112-20/+21
|/ / / / /
* | | | | Merge branch '38869-labels' into 'master'Phil Hughes2017-10-114-151/+137
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use ES6 modules in labels and labels managerFilipa Lacerda2017-10-104-151/+137
| | |_|/ | |/| |
* | | | Merge branch 'docs-image-discussion' into 'master'Achilleas Pipinellis2017-10-116-3/+40
|\ \ \ \
| * | | | Add image discussion docsClement Ho2017-10-116-3/+40
|/ / / /
* | | | Merge branch 'rc/refactor-testing-docs' into 'master'Achilleas Pipinellis2017-10-1114-876/+1027
|\ \ \ \
| * | | | Refactor the Development documentation, and divide the Testing documentation ...Rémy Coutable2017-10-1114-876/+1027
|/ / / /
* | | | Merge branch '38828-update-kubernetes-helm-chart-docs' into 'master'Achilleas Pipinellis2017-10-113-14/+16
|\ \ \ \
| * | | | Update Kubernetes Helm chart docsJoshua Lambert2017-10-113-14/+16
|/ / / /
* | | | Merge branch 'add-resolve-discussion-test' into 'master'Filipa Lacerda2017-10-101-5/+15
|\ \ \ \
| * | | | Add explicit test to test resolved discussion toggle contentadd-resolve-discussion-testClement Ho2017-10-101-5/+15
| |/ / /
* | | | Merge branch '36160-select2-dropdown' into 'master'Annabel Dunstone Gray2017-10-102-0/+6
|\ \ \ \
| * | | | Decreases z-index of select2 to a lower number than our navigation barFilipa Lacerda2017-10-102-0/+6
|/ / / /
* | | | Merge branch 'fix-dropdown' into 'master'Annabel Dunstone Gray2017-10-102-2/+3
|\ \ \ \
| * | | | Remove not selector increasing specificity of rulesfix-dropdownFilipa Lacerda2017-10-102-2/+3
| |/ / /
* | | | Merge branch 'lock-discussion-docs' into 'master'Clement Ho2017-10-102-24/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Locked issues / mrs docsVictor Wu2017-10-102-24/+16
|/ / /
* | | Merge branch 'fix-resolved-discussion' into 'master'Filipa Lacerda2017-10-104-10/+6
|\ \ \
| * | | Fix unable to expand text diff discussion commentsClement Ho2017-10-104-10/+6
|/ / /
* | | Merge branch 'gitaly-0.45.1' into 'master'Rémy Coutable2017-10-103-4/+4
|\ \ \
| * | | Fix mysterious rubocop failuregitaly-0.45.1Jacob Vosmaer2017-10-101-2/+2
| * | | Run bundleJacob Vosmaer2017-10-101-2/+2
| * | | Use gitaly-proto 0.41.0Jacob Vosmaer2017-10-101-1/+1
| * | | Use Gitaly 0.45.1Jacob Vosmaer2017-10-101-1/+1
* | | | Merge branch 'an/use-branch-exists-over-branch-names-include' into 'master'Rémy Coutable2017-10-109-10/+15
|\ \ \ \
| * | | | Stop using `branch_names.include?` and use `branch_exists?`Andrew Newdigate2017-10-109-10/+15
|/ / / /
* | | | Merge branch '38869-u2f' into 'master'38968-label-picker-should-be-cleared-upon-selecting-a-labelPhil Hughes2017-10-1010-374/+321
|\ \ \ \
| * | | | Remove u2f from globalnamespace38869-u2fFilipa Lacerda2017-10-0910-374/+321
* | | | | Merge branch 'flash-es6-module' into 'master'Filipa Lacerda2017-10-1074-203/+454
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | removed global eslint for remaining filesflash-es6-modulePhil Hughes2017-10-105-8/+0
| * | | | fixed notes specsPhil Hughes2017-10-103-13/+33
| * | | | karma spec fixesPhil Hughes2017-10-106-18/+13
| * | | | fixed eslintPhil Hughes2017-10-102-11/+10
| * | | | flash testsPhil Hughes2017-10-102-11/+282
| * | | | spec fixesPhil Hughes2017-10-103-8/+13