summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-23450-4538/+5232
|\
| * Merge branch 'tc-remove-nonexisting-namespace-pending-delete-projects' into '...Douwe Maan2017-08-235-1/+107
| |\
| | * Use EachBatch concern to loop over batchestc-remove-nonexisting-namespace-pending-delete-projectsToon Claes2017-08-222-26/+22
| | * Migration to remove pending delete projects with non-existing namespaceToon Claes2017-08-225-1/+111
| * | Merge branch 'rs-fix-admin-logs-timeout' into 'master'Douwe Maan2017-08-233-16/+17
| |\ \
| | * | Refactor `Admin::LogsController#show`rs-fix-admin-logs-timeoutRobert Speicher2017-08-222-10/+15
| | * | Fix a potential timeout in `Gitlab::Logger.read_latest`Robert Speicher2017-08-221-6/+2
| * | | Merge branch 'rs-stub-storage-availability-check' into 'master'Douwe Maan2017-08-232-1/+13
| |\ \ \
| | * | | Stub `ForkedStorageCheck.storage_available?` by default in all specsrs-stub-storage-availability-checkRobert Speicher2017-08-222-1/+13
| * | | | Merge branch 'fix-broken-testing-of-some-integrations' into 'master'Douwe Maan2017-08-233-16/+40
| |\ \ \ \
| | * | | | Fix inability to test some project integrationsfix-broken-testing-of-some-integrationsRubén Dávila2017-08-223-16/+40
| * | | | | Merge branch 'disable-webpack-optimization' into 'master'Tim Zallmann2017-08-231-0/+1
| |\ \ \ \ \
| | * | | | | disable webpack.optimize.ModuleConcatenationPlugin during karma testsdisable-webpack-optimizationMike Greiling2017-08-211-0/+1
| * | | | | | Merge branch '33503-new-icons-for-system-notes' into 'master'Clement Ho2017-08-2316-18/+29
| |\ \ \ \ \ \
| | * | | | | | Implement new system note iconsBryce Johnson2017-08-2316-18/+29
| |/ / / / / /
| * | | | | | Merge branch 'fix-group-policy-specs-on-mysql' into 'master'Robert Speicher2017-08-221-0/+6
| |\ \ \ \ \ \
| | * | | | | | Fixes group policy specs on MySQL.fix-group-policy-specs-on-mysqlTiago Botelho2017-08-221-0/+6
| * | | | | | | Merge branch 'rs-fix-master' into 'master'Stan Hu2017-08-222-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Add `:nested_groups` metadata to two subgroup-related specsRobert Speicher2017-08-222-2/+2
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch '36779-update-kubernetes-install-docs' into 'master'Marcia Ramos2017-08-224-3/+28
| |\ \ \ \ \ \ \
| | * | | | | | | Apply feedbackJoshua Lambert2017-08-221-1/+1
| | * | | | | | | Fix spacing with code block36779-update-kubernetes-install-docsJoshua Lambert2017-08-223-0/+5
| | * | | | | | | Add link to cloud native charts, add helm init infoJoshua Lambert2017-08-224-3/+23
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch '36496-badges-should-not-be-huge' into 'master'Clement Ho2017-08-221-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Sometimes you don't see the forrest because of all the trees, set now the pre...36496-badges-should-not-be-hugeTim Zallmann2017-08-181-0/+3
| * | | | | | | | Merge branch 'update-monaco-loader-test' into 'master'Jacob Schatz2017-08-224-13/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add global __webpack_public_path__ to eslint configupdate-monaco-loader-testMike Greiling2017-08-184-7/+4
| | * | | | | | | | fix monaco loader test to not break with statically analyzed import statementsMike Greiling2017-08-181-7/+5
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'docs-merge-request-diff-nav' into 'master'Marcia Ramos2017-08-222-0/+8
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | img/merge_request_diff_file_navigation.pngVictor Wu2017-08-221-0/+0
| | * | | | | | | Merge request diff file navigationVictor Wu2017-08-221-0/+8
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'git-gc-raise-lease-timeotu' into 'master'Sean McGivern2017-08-222-1/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Raise GC Lease Timeout to 24hgit-gc-raise-lease-timeotuKim "BKC" Carlbäcker2017-08-222-1/+5
| * | | | | | | | Merge branch 'fix/sm/34762-bad-validation-message' into 'master'Kamil Trzciński2017-08-223-2/+10
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Update kubernetes_service_spec.rbfix/sm/34762-bad-validation-messageShinya Maeda2017-08-221-1/+1
| | * | | | | | | Enfouce namespace for Kubernetes to lowercaseShinya Maeda2017-08-223-2/+10
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch '36721-rename-repo-text' into 'master'Annabel Dunstone Gray2017-08-221-2/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | 36721 Remove incorrect paragraph regarding renaming repos in settings36721-rename-repo-texttauriedavis2017-08-211-2/+0
| * | | | | | | Merge branch 'zj-fix-import-gitlab-export-form' into 'master'Douwe Maan2017-08-223-40/+49
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Update form to properly set the pathZeger-Jan van de Weg2017-08-223-40/+49
| * | | | | | | Merge branch 'fix/import-fork-mr' into 'master'Sean McGivern2017-08-226-2/+29
| |\ \ \ \ \ \ \
| | * | | | | | | fix static analysisfix/import-fork-mrJames Lopez2017-08-221-2/+0
| | * | | | | | | fix specsJames Lopez2017-08-221-1/+6
| | * | | | | | | add changelogJames Lopez2017-08-211-0/+5
| | * | | | | | | Fix fork MRs importing issueJames Lopez2017-08-215-2/+21
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'fix-broadcast-message-caching' into 'master'Sean McGivern2017-08-223-5/+55
| |\ \ \ \ \ \ \
| | * | | | | | | Fix caching of future broadcast messagesfix-broadcast-message-cachingYorick Peterse2017-08-213-5/+55
| | |/ / / / / /
| * | | | | | | Update VERSION to 9.6.0-prev9.6.0.preSimon Knox2017-08-221-1/+1
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSimon Knox2017-08-224-33/+94
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '34533-inline-single-authorized-projects' into 'master'Douwe Maan2017-08-224-33/+94
| | |\ \ \ \ \ \ \