summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bvl-move-import-common-metrics-migration' into 'master'Kamil Trzciński2018-09-101-0/+2
* Update VERSION to 11.3.0-rc5v11.3.0-rc5GitLab Release Tools Bot2018-09-101-1/+1
* Merge branch 'sh-fix-ldap-qa' into 'master'Rémy Coutable2018-09-101-1/+1
* Merge branch 'dks-update-templates-licenses-11-3' into 'master'Bob Van Landuyt2018-09-1019-563/+93
* Merge branch 'master' into 11-3-stable-prepare-rc5Bob Van Landuyt2018-09-10614-4772/+10194
|\
| * Merge branch '51281-on-master-diff-view-contains-extra-and-signs' into 'master'Phil Hughes2018-09-103-4/+19
| |\
| | * Resolve "On master, inline diff view contains extra `+` and `-` signs"Tim Zallmann2018-09-103-4/+19
| |/
| * Merge branch 'sidekiq-query' into 'master'Rémy Coutable2018-09-101-0/+20
| |\
| | * Disable query limit counter in sidekiqJan Provaznik2018-09-041-0/+20
| * | Merge branch 'api-promote-find-branch' into 'master'Rémy Coutable2018-09-104-11/+13
| |\ \
| | * | Fix rubocopRobert Schilling2018-09-081-5/+3
| | * | API: Use find_branch! in all placesRobert Schilling2018-09-084-11/+15
| * | | Merge branch 'sh-fix-failing-instances-statistics-spec' into 'master'Rémy Coutable2018-09-101-0/+2
| |\ \ \
| | * | | Explicitly enable usage ping for instance statistics specStan Hu2018-09-091-0/+2
| * | | | Merge branch 'sh-fix-new-project-qa' into 'master'Grzegorz Bizon2018-09-101-1/+2
| |\ \ \ \
| | * | | | Fix QA builds failing due to change in new project page behaviorStan Hu2018-09-081-1/+2
| * | | | | Merge branch '38208-due-dates-system-notes' into 'master'Stan Hu2018-09-096-2/+57
| |\ \ \ \ \
| | * | | | | Add system note when due date is changedEva Kadlecová2018-09-096-2/+57
| * | | | | | Merge branch 'fix-invite-group-spec-ee' into 'master'Robert Speicher2018-09-091-9/+8
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Update invite_group_spec to be consistent with EEDennis Tang2018-09-071-9/+8
| * | | | | | Merge branch 'sh-fix-cohorts-spec-ce'Stan Hu2018-09-091-0/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Fix spec/features/instance_statistics/cohorts_spec.rbsh-fix-cohorts-spec-ceStan Hu2018-09-081-0/+2
| * | | | | | Merge branch '51267-remove-gitlab-gitaccess-authed_via_jwt' into 'master'Stan Hu2018-09-081-6/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Remove Gitlab::GitAccess#authed_via_jwt?Ash McKenzie2018-09-081-6/+0
| * | | | | | Merge branch '48167-fix-outdated-discussions-new-datastructure' into 'master'Tim Zallmann2018-09-088-8/+166
| |\ \ \ \ \ \
| | * | | | | | Resolve "Merge requests show outdated discussions on changes tab"André Luís2018-09-088-8/+166
| |/ / / / / /
| * | | | | | Merge branch 'sh-fix-scope-error-container-repo' into 'master'Stan Hu2018-09-081-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix scoping errors occuring for ContainerRepository on some buildsStan Hu2018-09-071-1/+1
| | |/ / / / /
| * | | | | | Merge branch '2934-create-new-project-re-add-project-name-field' into 'master'Tim Zallmann2018-09-0814-25/+124
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Resolve "Create new project: Re-add project name field"Martin Wortschack2018-09-0814-25/+124
| |/ / / / /
| * | | | | Merge branch 'sh-bump-gitlab-shell-8-3-0' into 'master'Stan Hu2018-09-081-1/+1
| |\ \ \ \ \
| | * | | | | Bump gitlab-shell to 8.3.0Stan Hu2018-09-071-1/+1
| | |/ / / /
| * | | | | Merge branch '51233-process-urls-with-spaces-to-support-old-attachment-upload...Stan Hu2018-09-085-5/+24
| |\ \ \ \ \
| | * | | | | Resolve "Process urls with spaces in all markdown processing"Brett Walker2018-09-085-5/+24
| |/ / / / /
| * | | | | Merge branch 'tz-mr-new-datastructure' into 'master'Mike Greiling2018-09-0737-530/+890
| |\ \ \ \ \
| | * | | | | Fix for a check that fails if no file can be selectedTim Zallmann2018-09-081-42/+46
| | * | | | | Fix typo on targetLine in mutationAndré Luís2018-09-071-1/+1
| | * | | | | Cosmetic changes to let setupTim Zallmann2018-09-073-57/+48
| | * | | | | Adapted so utils + actions don't include any mutations and mutations are alwa...Tim Zallmann2018-09-077-109/+164
| | * | | | | Fixes based on MR discussion around naming, mutations, handling of stateTim Zallmann2018-09-0711-24/+23
| | * | | | | Made the discussion tests artificial to have them stable, mocked RAF + RICTim Zallmann2018-09-072-46/+98
| | * | | | | Added new tests for newly added mutations, actions, utilsTim Zallmann2018-09-076-12/+221
| | * | | | | Fixed another rspec about collapsing notes after adding themTim Zallmann2018-09-073-8/+9
| | * | | | | Fix Linting ErrorTim Zallmann2018-09-072-2/+0
| | * | | | | Fix for RSPec for User PostsTim Zallmann2018-09-071-2/+2
| | * | | | | Removed Console.logTim Zallmann2018-09-071-2/+0
| | * | | | | Fix for Karma, Static Analysis and RSPec for MR PageTim Zallmann2018-09-077-40/+33
| | * | | | | Fixed Resolving, Loading more and Line BugsTim Zallmann2018-09-0711-95/+119
| | * | | | | Fix for displaying left side comments when no discussion availableTim Zallmann2018-09-072-6/+10
| | * | | | | Fixed Left side commentsTim Zallmann2018-09-072-3/+5
View Lorry Controller Status