| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove support for legacy tar.gz pages artifacts | Jacob Vosmaer | 2018-04-03 | 2 | -67/+51 |
| | | |||||
| * | Merge branch 'blackst0ne-rails5-update-bin-rspec' into 'master' | Rémy Coutable | 2018-04-03 | 1 | -0/+6 |
| |\ | | | | | | | | | [Rails5] Allow using `RAILS5` env with rspec See merge request gitlab-org/gitlab-ce!18140 | ||||
| | * | [Rails5] Allow using `RAILS5` env with rspecblackst0ne-rails5-update-bin-rspec | blackst0ne | 2018-04-03 | 1 | -0/+6 |
| | | | |||||
| * | | Merge branch '44861-mark-gitaly-nplus-one-again' into 'master' | Rémy Coutable | 2018-04-03 | 2 | -4/+24 |
| |\ \ | | | | | | | | | | | | | | | | | | | Re-enable allowing n+1 Gitaly for branches index Closes #44861 See merge request gitlab-org/gitlab-ce!18131 | ||||
| | * | | Re-enable allowing n+1 Gitaly calls for cold cache44861-mark-gitaly-nplus-one-again | Lin Jen-Shin | 2018-04-03 | 2 | -4/+24 |
| | | | | | | | | | | | | | | | | Whenever cache is enabled and cold, branches index still makes n+1 calls. Make sure we catch this. | ||||
| * | | | Merge branch 'fix/qa/gb/use-project-path-in-package-and-qa-action' into 'master' | Rémy Coutable | 2018-04-03 | 2 | -2/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | Use project path in package-and-qa to fetch script See merge request gitlab-org/gitlab-ce!18145 | ||||
| | * | | | 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 ↵ | Kamil Trzciński | 2018-04-03 | 2 | -11/+48 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix wrong error handling in update page service Closes #44817 See merge request gitlab-org/gitlab-ce!18098 | ||||
| | * | | | 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 documentation about backporting changes from EE to CE See merge request gitlab-org/gitlab-ce!18003 | ||||
| | * | | | | 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 admins See merge request gitlab-org/gitlab-ce!18137 | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Replace the `project/issues/labels.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!18126 | ||||
| | * | | | | | | 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 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wrong user in push notification email" Closes #44921 See merge request gitlab-org/gitlab-ce!18148 | ||||
| | * | | | | | | Fix body of email when commits are pushed to an MR | Sean McGivern | 2018-04-03 | 4 | -3/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was sending the current user, which is the recipient! It should be the user who pushed the commits. | ||||
| * | | | | | | | 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 failure Closes #44882 See merge request gitlab-org/gitlab-ce!18130 | ||||
| | * | | | | | | 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 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Replace the `project/issues/issues.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!17950 | ||||
| | * | | | | | | | 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.log See merge request gitlab-org/gitlab-ce!18127 | ||||
| | * | | | | | | | Move Sidekiq exporter logs to log/sidekiq_exporter.logsh-move-sidekiq-exporter-logs | Stan Hu | 2018-04-02 | 4 | -2/+25 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Sidekiq exporter logs were mixing with the normal Sidekiq logs. In order to support structured logging in Sidekiq, we either need to split this data out or convert the exporter to produce structured logs. Since Sidekiq job processing is fundamentally different information from Web server traffic, it seems cleaner to move the metrics traffic into a separate file, where they can be parsed by a different filter if needed. Relates to #20060 | ||||
| * | | | | | | | Merge branch 'blackst0ne-rails5-isolate-test_after_commit' into 'master' | Rémy Coutable | 2018-04-03 | 2 | -23/+27 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Isolate `test_after_commit` gem See merge request gitlab-org/gitlab-ce!18129 | ||||
| | * | | | | | | | [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 specs See merge request gitlab-org/gitlab-ce!18138 | ||||
| | * | | | | | | 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 docs See merge request gitlab-org/gitlab-ce!18097 | ||||
| | * | | | | | | Refactor the browser performance testing docsdocs/performance-testing | Achilleas Pipinellis | 2018-03-29 | 1 | -20/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From my experience in setting this up https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/231/diffs | ||||
| * | | | | | | | Merge branch 'dm-gitlab-http-blocked-url-error' into 'master' | Robert Speicher | 2018-04-02 | 10 | -50/+90 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Raise more descriptive errors when URLs are blocked See merge request gitlab-org/gitlab-ce!18058 | ||||
| | * | | | | | | 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 dropdown" Closes #40907 See merge request gitlab-org/gitlab-ce!17869 | ||||
| | * | | | | | | | Resolve "Clicking confidential and lock icons on sidebar should also ↵ | Dennis Tang | 2018-04-02 | 10 | -163/+297 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | activate dropdown" | ||||
| * | | | | | | | Merge branch 'dz-type-button' into 'master' | Filipa Lacerda | 2018-04-02 | 7 | -14/+14 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add button type to settings toggle Closes #44737 See merge request gitlab-org/gitlab-ce!18134 | ||||
| | * | | | | | | | Add button type to settings toggledz-type-button | Dmitriy Zaporozhets | 2018-04-02 | 7 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | | Merge branch '44878-update-brakeman-3.6.1-to-4.2.1' into 'master' | Robert Speicher | 2018-04-02 | 3 | -3/+8 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update brakeman to 4.2.1 Closes #44878 See merge request gitlab-org/gitlab-ce!18122 | ||||
| | * | | | | | | | | 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 pipelines See merge request gitlab-org/gitlab-ce!18105 | ||||
| | * | | | | | | | | | 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 docs See merge request gitlab-org/gitlab-ce!18029 | ||||
| | * | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify mock data files See merge request gitlab-org/gitlab-ce!18091 | ||||
| | * | | | | | | | | | | 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 See merge request gitlab-org/gitlab-ce!18001 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |