Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename "scheduled" label/badge of delayed jobs to "delayed" | Shinya Maeda | 2018-10-19 | 1 | -1/+1 |
| | |||||
* | Merge branch 'bvl-remove-forked-project-link' into 'master' | Sean McGivern | 2018-10-19 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Remove ForkedProjectLink model Closes #38883 See merge request gitlab-org/gitlab-ce!22226 | ||||
| * | Remove the `ForkedProjectLink` model | Bob Van Landuyt | 2018-10-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted. | ||||
* | | Make getting a user by the username case insensitive | William George | 2018-10-18 | 4 | -18/+10 |
| | | |||||
* | | Merge branch 'sh-remove-koding' into 'master' | Douwe Maan | 2018-10-15 | 1 | -4/+0 |
|\ \ | | | | | | | | | | | | | | | | | | | Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334 | ||||
| * | | Remove Koding integration and documentation | Stan Hu | 2018-10-12 | 1 | -4/+0 |
| |/ | | | | | | | | | | | This integration no longer works and does not appear to be supported. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697 | ||||
* | | Allow getting the merge base of multiple revisions | Bob Van Landuyt | 2018-10-12 | 1 | -7/+2 |
|/ | | | | | As we now support getting the merge base for multiple revisions in gitaly, we can provide this functionality in our API | ||||
* | Remove Git circuit breaker | Zeger-Jan van de Weg | 2018-10-10 | 2 | -21/+2 |
| | | | | | | | Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0. | ||||
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Bob Van Landuyt | 2018-10-05 | 1 | -4/+3 |
|\ | |||||
| * | Merge branch 'security-bw-confidential-titles-through-markdown-api' into ↵ | Bob Van Landuyt | 2018-10-05 | 1 | -4/+3 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [master] Confidential issue/private snippet titles can be read by unauthenticated user through GFM markdown API Closes #2706 See merge request gitlab/gitlabhq!2507 | ||||
| | * | post_process markdown redered by API | Brett Walker | 2018-09-29 | 1 | -4/+3 |
| | | | |||||
* | | | Merge branch 'ce-5987-project-templates-api' into 'master' | Robert Speicher | 2018-10-05 | 4 | -5/+65 |
|\ \ \ | | | | | | | | | | | | | | | | | Add a new project-specific templates API endpoint See merge request gitlab-org/gitlab-ce!22118 | ||||
| * | | | Backport project template API to CE | Nick Thomas | 2018-10-05 | 4 | -5/+65 |
| |/ / | |||||
* | | | Merge branch 'master-ce' into scheduled-manual-jobs | Shinya Maeda | 2018-10-05 | 2 | -4/+8 |
|\ \ \ | |||||
| * | | | Make GitLab pages support access control | Tuomo Ala-Vannesluoma | 2018-10-05 | 1 | -0/+6 |
| |/ / | |||||
| * | | Merge branch 'features/unauth-access-ssh-keys' into 'master' | Douwe Maan | 2018-10-05 | 1 | -4/+2 |
| |\ \ | | | | | | | | | | | | | | | | | List public ssh keys by id or username without authentication See merge request gitlab-org/gitlab-ce!20118 | ||||
| | * | | List public ssh keys by id or username without authentication | Ronald Claveau | 2018-10-03 | 1 | -4/+2 |
| | | | | |||||
* | | | | Merge branch 'master-ce' into scheduled-manual-jobs | Shinya Maeda | 2018-10-05 | 2 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'fix-todo-cops' into 'master' | Rémy Coutable | 2018-10-04 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fix todo cops See merge request gitlab-org/gitlab-ce!21850 | ||||
| | * | | | Fix SpaceBeforeFirstArg cop | Semyon Pupkov | 2018-09-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Includes commit stats in POST project commits API51803-include-commits-stats-in-projects-api | Jacopo | 2018-10-03 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master-ce' into scheduled-manual-jobs | Shinya Maeda | 2018-10-04 | 2 | -1/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '45016-add-web-ide-commits-to-usage-ping' into 'master' | Douwe Maan | 2018-10-03 | 1 | -0/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Web IDE commits to usage ping Closes #45016 See merge request gitlab-org/gitlab-ce!22007 | ||||
| | * | | | | Implements Web IDE commits counter in Redis | Tiago Botelho | 2018-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes a temporary implementation of the Web IDE commits counter using Redis while https://gitlab.com/gitlab-org/gitlab-ce/issues/52096 is being discussed further for a more generic approach to counters | ||||
| | * | | | | Adds WebIDE commits to UsagePing | Tiago Botelho | 2018-10-01 | 1 | -0/+3 |
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | Implements UsageCounters model to track feature usage counters and makes easy to extend for future counters | ||||
| * | | | | #13650 added wip search functionality and tests | Chantal Rollison | 2018-10-03 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add a new status to ci_builds.status | Shinya Maeda | 2018-10-02 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge remote-tracking branch 'dev/master' | Bob Van Landuyt | 2018-10-01 | 1 | -3/+19 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'fix-events-finder-incomplete' into 'master' | Bob Van Landuyt | 2018-10-01 | 1 | -3/+19 |
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | [master] Redact events shown in the events API See merge request gitlab/gitlabhq!2514 | ||||
| | * | | | Redact events shown in the events API | Nick Thomas | 2018-09-21 | 1 | -3/+19 |
| | | |/ | | |/| | |||||
* | | | | Merge branch 'lib-api-frozen-string-enable' into 'master' | Rémy Coutable | 2018-10-01 | 89 | -1/+180 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Enable frozen string in lib/api and lib/backup See merge request gitlab-org/gitlab-ce!22005 | ||||
| * | | | | Enable frozen string in lib/api and lib/backup | gfyoung | 2018-09-29 | 89 | -1/+180 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially addresses #47424. Had to make changes to spec files because stubbing methods on frozen objects is a mess in RSpec and leads to failures: https://github.com/rspec/rspec-mocks/issues/1190 | ||||
* | | | | Merge branch 'feature/set-public-email-through-api' into 'master' | Rémy Coutable | 2018-10-01 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Set public email through api Closes #37675 See merge request gitlab-org/gitlab-ce!21938 | ||||
| * | | | allow users api to set public_email | Alexis Reigel | 2018-10-01 | 1 | -0/+1 |
| | | | | |||||
| * | | | remove obsolete parameter from users api | Alexis Reigel | 2018-09-26 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch '43832-adds-chdmod-to-commits-actions-api' into 'master' | Rémy Coutable | 2018-09-27 | 1 | -1/+20 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to work with execute permissions in GitLab API Closes #43832 See merge request gitlab-org/gitlab-ce!21866 | ||||
| * | | | | Adds chmod action to POST /projects/:id/repository/commits API | Jacopo | 2018-09-27 | 1 | -1/+20 |
| | |/ / | |/| | | | | | | | | | | With this action the user can update the execute_filemode of a given file in the repository. | ||||
* | | | | Merge branch 'feature/add-public-email-to-users-api' into 'master' | Rémy Coutable | 2018-09-27 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature/add public email to users api Closes #39346 See merge request gitlab-org/gitlab-ce!21909 | ||||
| * | | | | add user's public_email attribute to api | Alexis Reigel | 2018-09-27 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'feature/runner-type-filter-for-admin-view' into 'master' | Kamil Trzciński | 2018-09-26 | 1 | -3/+28 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Feature: Runner type filter for admin view See merge request gitlab-org/gitlab-ce!19649 | ||||
| * | | | add status param to runners api | Alexis Reigel | 2018-09-15 | 1 | -0/+9 |
| | | | | |||||
| * | | | add type param to runners api | Alexis Reigel | 2018-09-15 | 1 | -3/+19 |
| |/ / | |||||
* | | | Remove background job throttling feature51509-remove-sidekiq-limit-fetch | Valery Sizov | 2018-09-24 | 1 | -5/+0 |
| |/ |/| | | | | | We remove this feature as it never worked properly | ||||
* | | Remove EE-specific code from ProtectedRefAccess | Sean McGivern | 2018-09-17 | 2 | -3/+3 |
| | | |||||
* | | Fix grammar (setup to set-up) in code comments, spec, views, etc. | Marcel Amirault | 2018-09-17 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'feature/runner-state-filter-for-admin-view' into 'master' | Grzegorz Bizon | 2018-09-14 | 1 | -11/+6 |
|\ | | | | | | | | | Feature: State filter for admin runners view See merge request gitlab-org/gitlab-ce!19625 | ||||
| * | replace cond. assignment by default param value | Alexis Reigel | 2018-09-12 | 1 | -5/+3 |
| | | |||||
| * | dry up available scopes to constants | Alexis Reigel | 2018-08-20 | 1 | -3/+3 |
| | | |||||
| * | add Ci::Runner.offline scope to API | Alexis Reigel | 2018-08-20 | 1 | -10/+7 |
| | | |||||
* | | Merge branch 'rubocop-code-reuse' into 'master' | Robert Speicher | 2018-09-13 | 43 | -0/+271 |
|\ \ | | | | | | | | | | | | | Add RuboCop cops to enforce code reusing rules See merge request gitlab-org/gitlab-ce!21391 |