summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix anchor linkdocs-devguide-cherry-pick-ce-to-eeMarcia Ramos2018-03-011-1/+1
* move cherry-pick guide to general dev documentationMarcia Ramos2018-03-012-66/+96
* copyeditMarcia Ramos2018-02-261-3/+8
* add docs guidelines: cherry-picking commits from CE to EEMarcia Ramos2018-02-261-0/+101
* Merge branch 'gitaly-docs' into 'master'Rémy Coutable2018-02-261-7/+17
|\
| * Clarify when disabling Gitaly makes senseJacob Vosmaer (GitLab)2018-02-261-7/+17
|/
* Merge branch 'patch-28' into 'master'Sean McGivern2018-02-261-1/+1
|\
| * Correcting documentation about project hooks settingsThomas Dudouet2018-02-231-1/+1
* | Merge branch 'dm-waitable-worker' into 'master'Sean McGivern2018-02-265-114/+145
|\ \
| * | Allow bulk_perform_and_wait wait timeout to be overriddenDouwe Maan2018-02-261-2/+2
| * | Extract WaitableWorker out of AuthorizedProjectsWorkerDouwe Maan2018-02-265-114/+145
* | | Merge branch 'get-rid-of-hardcoded-path-or-names-in-factories' into 'master'Nick Thomas2018-02-262-10/+10
|\ \ \
| * | | Get rid of hard-coded user/project/group names that could clash with DB seque...Rémy Coutable2018-02-262-10/+10
* | | | Merge branch 'jprovazn-issuable-data' into 'master'Filipa Lacerda2018-02-263-18/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Don't convert issuable_initial_data into JSONjprovazn-issuable-dataJan Provaznik2018-02-263-18/+18
* | | | Merge branch '43598-fix-duplicate-label-load-failure' into 'master'Phil Hughes2018-02-262-1/+6
|\ \ \ \
| * | | | Add changelog entryKushal Pandya2018-02-261-0/+5
| * | | | Use imported `DropdownUtils`Kushal Pandya2018-02-261-1/+1
* | | | | Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master'Douwe Maan2018-02-265-5/+23
|\ \ \ \ \
| * | | | | Respond 404 when repo does not existmk/fix-error-code-for-repo-does-not-existMichael Kozono2018-02-245-5/+23
* | | | | | Merge branch 'grpc-unavailable-restart' into 'master'Douwe Maan2018-02-267-131/+250
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failedJacob Vosmaer (GitLab)2018-02-267-131/+250
|/ / / / /
* | | | | Update CHANGELOG.md for 10.5.2Ian Baum2018-02-2513-60/+21
| |/ / / |/| | |
* | | | Merge branch 'backport-qa_78' into 'master'Grzegorz Bizon2018-02-2515-13/+167
|\ \ \ \ | |/ / / |/| | |
| * | | Fix specsbackport-qa_78Felipe Artur2018-02-231-1/+2
| * | | Small review changesFelipe Artur2018-02-222-2/+2
| * | | test merge request rebaseFelipe Artur2018-02-1915-14/+167
* | | | Merge branch 'minimal-fix-for-artifacts-service' into 'master'Grzegorz Bizon2018-02-243-18/+63
|\ \ \ \
| * | | | Revert "Revert "Use Dir.mktmpdir""Shinya Maeda2018-02-241-15/+14
| * | | | Revert "Use Dir.mktmpdir"minimal-fix-for-artifacts-serviceShinya Maeda2018-02-241-14/+15
| * | | | Use Dir.mktmpdirShinya Maeda2018-02-241-15/+14
| * | | | Change FileUtils.cp to FileUtils.copyShinya Maeda2018-02-241-1/+1
| * | | | Bring back the initial commitShinya Maeda2018-02-242-25/+14
| * | | | Add chnagelogShinya Maeda2018-02-241-0/+5
| * | | | Fixed static analysysShinya Maeda2018-02-242-6/+6
| * | | | Check if the latest permanent file exists before remove file. Add tests.Shinya Maeda2018-02-232-16/+31
| * | | | Copy original file to temp file always to prevent data lossShinya Maeda2018-02-232-17/+33
| * | | | Minimal fix for artifacts serviceKamil Trzciński2018-02-231-5/+26
| | |/ / | |/| |
* | | | Merge branch 'refactor/move-filtered-search-vue-component' into 'master'Clement Ho2018-02-246-108/+114
|\ \ \ \
| * | | | Move RecentSearchesDropdownContent vue componentGeorge Tsiolis2018-02-226-108/+114
* | | | | Merge branch '43570-localstorage-clear-error-when-feature-test-fails-before-v...Stan Hu2018-02-231-2/+4
|\ \ \ \ \
| * | | | | prevent localStorage.clear from running when it would cause an errorMike Greiling2018-02-231-2/+4
* | | | | | Merge branch 'mk/fix-pg-undefined-table-untracked_files_for_uploads-does-not-...Stan Hu2018-02-231-2/+2
|\ \ \ \ \ \
| * | | | | | Fix deletion attempts on dropped tablesMichael Kozono2018-02-231-2/+2
| |/ / / / /
* | | | | | Merge branch 'boards-bundle-refactor' into 'master'Jacob Schatz2018-02-235-5/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into 'boards-bundle-refactor'Jacob Schatz2018-02-23550-3226/+7463
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master'Jacob Schatz2018-02-234-5/+7
|\ \ \ \ \ \
| * | | | | | Removed webpack tagConstance Okoghenun2018-02-231-1/+0
| * | | | | | Refactored webpack bundle tag for deploy keysproject-deploy-keys-bundle-tag-refactorConstance Okoghenun2018-02-233-4/+7
* | | | | | | Merge branch 'reduce-webpack-merge-conflicts' into 'master'Jacob Schatz2018-02-231-8/+10
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
View Lorry Controller Status