Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Re-enable allowing n+1 Gitaly calls for cold cache44861-mark-gitaly-nplus-one-again | Lin Jen-Shin | 2018-04-03 | 2 | -4/+24 | |
* | | | | | | | | Merge branch 'fix/qa/gb/use-project-path-in-package-and-qa-action' into 'master' | Rémy Coutable | 2018-04-03 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Correctly check whether package-and-qa runs for EEfix/qa/gb/use-project-path-in-package-and-qa-action | Grzegorz Bizon | 2018-04-03 | 1 | -1/+2 | |
| * | | | | | | | Use project path in package-and-qa to fetch script | Grzegorz Bizon | 2018-04-03 | 1 | -1/+1 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'fix/sm/fix-wrong-error-handling-in-update-page-service' into 'm... | Kamil Trzciński | 2018-04-03 | 2 | -11/+48 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | missing the public folder is InvaildStateErrorfix/sm/fix-wrong-error-handling-in-update-page-service | Shinya Maeda | 2018-03-30 | 2 | -6/+10 | |
| * | | | | | | | Fix bad naming | Shinya Maeda | 2018-03-30 | 1 | -2/+2 | |
| * | | | | | | | Fix wrong error handling in update page service | Shinya Maeda | 2018-03-30 | 2 | -9/+42 | |
* | | | | | | | | Merge branch 'add-documentation-about-backporting-changes' into 'master' | Tim Zallmann | 2018-04-03 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Add doc about backporting changes from EE to CEadd-documentation-about-backporting-changes | André Luís | 2018-03-26 | 1 | -0/+14 | |
* | | | | | | | | Merge branch 'rs-performance-bar-for-admins' into 'master' | Rémy Coutable | 2018-04-03 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Always allow the performance bar to be enabled for adminsrs-performance-bar-for-admins | Robert Speicher | 2018-04-02 | 2 | -0/+7 | |
* | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-issues-labels.feature' into ... | Rémy Coutable | 2018-04-03 | 8 | -154/+193 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Replace the `project/issues/labels.feature` spinach test with an rspec analog | blackst0ne | 2018-04-03 | 8 | -154/+193 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch '44921-wrong-user-in-push-notification-email' into 'master' | Grzegorz Bizon | 2018-04-03 | 4 | -3/+34 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix body of email when commits are pushed to an MR | Sean McGivern | 2018-04-03 | 4 | -3/+34 | |
* | | | | | | | | | | Merge branch 'qa/gb/do-not-auto-retry-package-and-qa-action' into 'master' | Rémy Coutable | 2018-04-03 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Do not retry package-and-qa manual action on failureqa/gb/do-not-auto-retry-package-and-qa-action | Grzegorz Bizon | 2018-04-02 | 1 | -0/+1 | |
* | | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-issues-issues.feature' into ... | Rémy Coutable | 2018-04-03 | 29 | -580/+532 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Replace the `project/issues/issues.feature` spinach test with an rspec analog | blackst0ne | 2018-04-03 | 29 | -580/+532 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'sh-move-sidekiq-exporter-logs' into 'master' | Sean McGivern | 2018-04-03 | 4 | -2/+25 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Move Sidekiq exporter logs to log/sidekiq_exporter.logsh-move-sidekiq-exporter-logs | Stan Hu | 2018-04-02 | 4 | -2/+25 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'blackst0ne-rails5-isolate-test_after_commit' into 'master' | Rémy Coutable | 2018-04-03 | 2 | -23/+27 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| * | | | | | | | | | [Rails5] Isolate `test_after_commit` gemblackst0ne-rails5-isolate-test_after_commit | blackst0ne | 2018-04-03 | 2 | -23/+27 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'backport-os-worker-specs' into 'master' | Sean McGivern | 2018-04-03 | 2 | -0/+265 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | backport missing object storage worker specsbackport-os-worker-specs | Micaël Bergeron | 2018-04-02 | 2 | -0/+265 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'docs/performance-testing' into 'master' | Marcia Ramos | 2018-04-02 | 1 | -20/+73 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Refactor the browser performance testing docsdocs/performance-testing | Achilleas Pipinellis | 2018-03-29 | 1 | -20/+73 | |
* | | | | | | | | Merge branch 'dm-gitlab-http-blocked-url-error' into 'master' | Robert Speicher | 2018-04-02 | 10 | -50/+90 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Rename allow_private_networks to allow_local_network | Douwe Maan | 2018-04-02 | 4 | -14/+12 | |
| * | | | | | | | Make error messages even more descriptive | Douwe Maan | 2018-04-02 | 3 | -37/+51 | |
| * | | | | | | | Added rescue to show a custom error when testing project integrations | Francisco Javier López | 2018-04-02 | 1 | -0/+2 | |
| * | | | | | | | Raise more descriptive errors when URLs are blocked | Douwe Maan | 2018-04-02 | 6 | -26/+52 | |
* | | | | | | | | Merge branch '40907-confidential-lock-icons-collapsed-sidebar' into 'master' | Filipa Lacerda | 2018-04-02 | 10 | -163/+297 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Resolve "Clicking confidential and lock icons on sidebar should also activate... | Dennis Tang | 2018-04-02 | 10 | -163/+297 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'dz-type-button' into 'master' | Filipa Lacerda | 2018-04-02 | 7 | -14/+14 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add button type to settings toggledz-type-button | Dmitriy Zaporozhets | 2018-04-02 | 7 | -14/+14 | |
* | | | | | | | | | Merge branch '44878-update-brakeman-3.6.1-to-4.2.1' into 'master' | Robert Speicher | 2018-04-02 | 3 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update brakeman 3.6.1 to 4.2.1 | Takuya Noguchi | 2018-04-01 | 3 | -3/+8 | |
* | | | | | | | | | | Merge branch 'docs/mirrored-repositories-for-pipelines-ce' into 'master' | Marcia Ramos | 2018-04-02 | 3 | -2/+16 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Provide clarification on mirrored repositories for pipelinesdocs/mirrored-repositories-for-pipelines-ce | Achilleas Pipinellis | 2018-03-30 | 3 | -2/+16 | |
* | | | | | | | | | | | Merge branch 'docs/lfs-s3-ce' into 'master' | Marcia Ramos | 2018-04-02 | 1 | -53/+56 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Refactor the LFS S3 docsdocs/lfs-s3-ce | Achilleas Pipinellis | 2018-03-30 | 1 | -53/+57 | |
* | | | | | | | | | | | Merge branch 'fl-prettier-mock-data' into 'master' | Clement Ho | 2018-04-02 | 7 | -882/+961 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Removes eslint disabled commentsfl-prettier-mock-data | Filipa Lacerda | 2018-03-29 | 7 | -882/+961 | |
* | | | | | | | | | | | | Merge branch 'backport-to-CE-5023' into 'master' | Douwe Maan | 2018-04-02 | 10 | -32/+831 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Backport changes in EE MR 4972: System Header and Footer | André Luís | 2018-04-02 | 10 | -32/+831 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'jramsay-list-commit-statuses-docs' into 'master' | Douwe Maan | 2018-04-02 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Add pagination docs to commit status APIjramsay-list-commit-statuses-docs | James Ramsay | 2018-04-01 | 1 | -2/+3 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'sh-cleanup-crlf-gitmodules' into 'master' | Douwe Maan | 2018-04-02 | 2 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ |