summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Moved o_auth/saml/ldap modules under gitlab/authHoratiu Eugen Vlad2018-02-2873-1911/+1944
|
* Merge branch 'gitaly-docs' into 'master'Rémy Coutable2018-02-261-7/+17
|\ | | | | | | | | | | | | Clarify when disabling Gitaly makes sense Closes #43551 See merge request gitlab-org/gitlab-ce!17357
| * 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 settings See merge request gitlab-org/gitlab-ce!17332
| * Correcting documentation about project hooks settingsThomas Dudouet2018-02-231-1/+1
| |
* | Merge branch 'dm-waitable-worker' into 'master'Sean McGivern2018-02-265-114/+145
|\ \ | | | | | | | | | | | | Extract WaitableWorker out of AuthorizedProjectsWorker See merge request gitlab-org/gitlab-ce!17356
| * | 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 sequences See merge request gitlab-org/gitlab-ce!17290
| * | | Get rid of hard-coded user/project/group names that could clash with DB ↵Rémy Coutable2018-02-262-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | sequences Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'jprovazn-issuable-data' into 'master'Filipa Lacerda2018-02-263-18/+18
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Don't convert issuable_initial_data into JSON See merge request gitlab-org/gitlab-ce!17318
| * | | Don't convert issuable_initial_data into JSONjprovazn-issuable-dataJan Provaznik2018-02-263-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of converting hash into JSON inside issuable_initial_data method, return hash and convert to JSON later. This allows us to easily extend basic issuable data with resource specific values. For example for Epic these data should include also labels, so we can then do something like: issuable_initial_data(@epic).merge(labels: @epic.labels).to_json
* | | | Merge branch '43598-fix-duplicate-label-load-failure' into 'master'Phil Hughes2018-02-262-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Group labels load failure when there are duplicate labels present Closes #43598 See merge request gitlab-org/gitlab-ce!17353
| * | | | 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 with more appropriate HTTP status code when repo does not exist See merge request gitlab-org/gitlab-ce!17341
| * | | | | 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 failed Closes gitaly#1036 See merge request gitlab-org/gitlab-ce!17293
| * | | | | 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
| |/ / / |/| | | | | | | [ci skip]
* | | | Merge branch 'backport-qa_78' into 'master'Grzegorz Bizon2018-02-2515-13/+167
|\ \ \ \ | |/ / / |/| | | | | | | | | | | QA BACKPORT - Test merge request rebase See merge request gitlab-org/gitlab-ce!17186
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimal fix for artifacts service Closes #43022 See merge request gitlab-org/gitlab-ce!17313
| * | | | Revert "Revert "Use Dir.mktmpdir""Shinya Maeda2018-02-241-15/+14
| | | | | | | | | | | | | | | | | | | | This reverts commit 34e16110e0fbe29c40fe984d4715ca5dcdaef508.
| * | | | Revert "Use Dir.mktmpdir"minimal-fix-for-artifacts-serviceShinya Maeda2018-02-241-14/+15
| | | | | | | | | | | | | | | | | | | | This reverts commit 28c6a6b04436230e6e9b29855e4d4d4f88d9a554.
| * | | | 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 component See merge request gitlab-org/gitlab-ce!16951
| * | | | Move RecentSearchesDropdownContent vue componentGeorge Tsiolis2018-02-226-108/+114
| | | | |
* | | | | Merge branch ↵Stan Hu2018-02-231-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43570-localstorage-clear-error-when-feature-test-fails-before-visiting-page' into 'master' Resolve "localStorage.clear() error when Capybara test fails before visiting page" Closes #43570 See merge request gitlab-org/gitlab-ce!17339
| * | | | | prevent localStorage.clear from running when it would cause an errorMike Greiling2018-02-231-2/+4
| | | | | |
* | | | | | Merge branch ↵Stan Hu2018-02-231-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'mk/fix-pg-undefined-table-untracked_files_for_uploads-does-not-exist' into 'master' Fix deletion attempts on dropped tables in specs Closes #42897 See merge request gitlab-org/gitlab-ce!17340
| * | | | | | Fix deletion attempts on dropped tablesMichael Kozono2018-02-231-2/+2
| |/ / / / /
* | | | | | Merge branch 'boards-bundle-refactor' into 'master'Jacob Schatz2018-02-235-5/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Refactored use of boards/boards_bundle.js and created a dispatcher import See merge request gitlab-org/gitlab-ce!17145
| * | | | | Merge branch 'master' into 'boards-bundle-refactor'Jacob Schatz2018-02-23550-3226/+7463
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | # Conflicts: # config/webpack.config.js
* | | | | | Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master'Jacob Schatz2018-02-234-5/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored webpack bundle tag for deploy keys See merge request gitlab-org/gitlab-ce!17324
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Reduce webpack merge conflicts See merge request gitlab-org/gitlab-ce!17328
| * | | | | | move webpack bundles we intend to keep below the list of bundles we're ↵reduce-webpack-merge-conflictsMike Greiling2018-02-231-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | refactoring to reduce conflicts
* | | | | | | Merge branch 'remove-issues-show' into 'master'Jacob Schatz2018-02-233-5/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Remove issue_show webpack bundle See merge request gitlab-org/gitlab-ce!17326
| * | | | | | remove issue_show webpack bundle in favor of pages/projects/issues/show/index.jsremove-issues-showMike Greiling2018-02-233-5/+1
| | | | | | |
View Lorry Controller Status