| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'zj-storage-path-deprecation' into 'master' | Douwe Maan | 2018-04-25 | 2 | -17/+17 |
| |\ | | | | | | | | | | | | | Legacy disk path refactor Closes gitaly#1111 See merge request gitlab-org/gitlab-ce!18364 | ||||
| | * | Gitlab::Shell works on shard name, not path | Zeger-Jan van de Weg | 2018-04-25 | 2 | -17/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | Direct disk access is done through Gitaly now, so the legacy path was deprecated. This path was used in Gitlab::Shell however. This required the refactoring in this commit. Added is the removal of direct path access on the project model, as that lookup wasn't needed anymore is most cases. Closes https://gitlab.com/gitlab-org/gitaly/issues/1111 | ||||
| * | | Cleanup after adding MR diff's commit_count (try 2) | Jan Provaznik | 2018-04-25 | 2 | -1/+28 |
| | | | | | | | | | | | | | * processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method | ||||
| * | | Merge branch 'master' into 10244-add-project-ci-cd-settings | Dylan Griffith | 2018-04-24 | 7 | -4/+154 |
| |\ \ | |/ | |||||
| | * | Move spec helpers/matchers/shared examples/contexts to their relevant folder | Rémy Coutable | 2018-04-23 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | Fix missing namespace for some internal users | Rubén Dávila | 2018-04-20 | 1 | -0/+66 |
| | | | |||||
| | * | Atomic internal ids for all models | Andreas Brandl | 2018-04-20 | 3 | -2/+60 |
| | | | |||||
| | * | Merge branch '45476-geo-statement-timeout-counting-local-job-artifacts' into ↵ | Yorick Peterse | 2018-04-19 | 2 | -1/+17 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Geo: Statement timeout counting local job artifacts" Closes #45476 See merge request gitlab-org/gitlab-ce!18444 | ||||
| | | * | Add index to file_store on ci_job_artifacts | Ash McKenzie | 2018-04-19 | 2 | -1/+17 |
| | | | | |||||
| | * | | Merge branch 'stuartnelson3/gitlab-ce-stn/issue-due-email' into 'master' | Douwe Maan | 2018-04-18 | 2 | -0/+10 |
| | |\ \ | | |/ | |/| | | | | | | | | | | | | | Email notification on issue due date Closes #27500 See merge request gitlab-org/gitlab-ce!17985 | ||||
| | | * | Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email' | Sean McGivern | 2018-04-10 | 10 | -21/+198 |
| | | |\ | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | | * | | Only send issue due emails to participants and custom subscribers | Sean McGivern | 2018-03-30 | 2 | -1/+11 |
| | | | | | |||||
| * | | | | Introduce new ProjectCiCdSetting10244-add-project-ci-cd-settings | Yorick Peterse | 2018-04-16 | 3 | -1/+111 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This model and the corresponding table will be used for storing settings specific to CI/CD, starting with the "group_runners_enabled" boolean. The model is called ProjectCiCdSetting and not ProjectCiCdSettings. The project exporter doesn't like plural model names as it uses "classify" which turns those into singular (so "ProjectCiCdSettings" becomes "ProjectCiCdSetting", producing an error if said class is undefined). The initial work in this commit was done by Dylan Griffith, with most of the migration work being done by Yorick Peterse. | ||||
| * | | | Merge branch 'dm-archived-read-only' into 'master' | Robert Speicher | 2018-04-12 | 1 | -2/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Make archived projects completely read-only Closes #44788 See merge request gitlab-org/gitlab-ce!18136 | ||||
| | * | | | Rename `create_merge_request` permissions | Bob Van Landuyt | 2018-04-11 | 1 | -2/+6 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | So we can distinguish between the permissions on the source and the target project. - `create_merge_request_from` indicates a user can create a merge request with the project as a source_project - `create_merge_request_in` indicates a user can create a merge request with the project as a target_project | ||||
| * | | | Merge branch 'zj-fix-environments-fixtures' into 'master' | Robert Speicher | 2018-04-11 | 1 | -1/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix enviroments seeding on certain branch names Closes #45051 See merge request gitlab-org/gitlab-ce!18263 | ||||
| | * | | | Fix enviroments seeding on certain branch names | Zeger-Jan van de Weg | 2018-04-10 | 1 | -1/+5 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Bit of a cryptic commit title, but our seeding will try to guard against branchnames being anything but alphanumerical. These charachters we gsub away but can't have an empty string as replacement. This change is less efficient, but given that the number of seeded MRs per project is very limited, this should be ok. | ||||
| * | | | Make sure hooks run when seeding admin user | Douwe Maan | 2018-04-10 | 1 | -10/+10 |
| |/ / | |||||
| * | | Modifies index on DeployTokens to use id | Mayra Cabrera | 2018-04-06 | 2 | -2/+2 |
| | | | |||||
| * | | Handles default expires_at date directly into DeployToken model | Mayra Cabrera | 2018-04-06 | 2 | -2/+2 |
| | | | |||||
| * | | Addresses database comments | Mayra Cabrera | 2018-04-06 | 3 | -10/+9 |
| | | | | | | | | | | | | | | | - Adds a default on expires_at datetime - Modifies deploy tokens views to handle default expires at value - Use datetime_with_timezone where possible - Remove unused scopes | ||||
| * | | Fixes broken schema and minor changes | Mayra Cabrera | 2018-04-06 | 1 | -1/+0 |
| | | | |||||
| * | | Get rid of Redis when dealing with deploy tokens | Kamil Trzciński | 2018-04-06 | 1 | -3/+2 |
| | | | | | | | | | We use controller actions to pass a newly created token and errors | ||||
| * | | Fix and optimise DB schema | Kamil Trzciński | 2018-04-06 | 3 | -21/+19 |
| | | | |||||
| * | | Include ProjectDeployTokens | Mayra Cabrera | 2018-04-06 | 3 | -6/+38 |
| | | | | | | | | | | | | | Also: - Changes scopes from serializer to use boolean columns - Fixes broken specs | ||||
| * | | Create barebones for Deploytoken | Mayra Cabrera | 2018-04-06 | 2 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | | Includes: - Model, factories, create service and controller actions - As usual, includes specs for everything - Builds UI (copy from PAT) - Add revoke action Closes #31591 | ||||
| * | | Merge branch 'fix/gb/reschedule-pipeline-stages-migration' into 'master' | Kamil Trzciński | 2018-04-05 | 3 | -21/+39 |
| |\ \ | | | | | | | | | | | | | Reschedule pipeline stages migration to run it again See merge request gitlab-org/gitlab-ce!18191 | ||||
| | * | | Reschedule pipeline stages migration to run it againfix/gb/reschedule-pipeline-stages-migration | Grzegorz Bizon | 2018-04-05 | 3 | -21/+39 |
| | | | | |||||
| * | | | Merge branch 'jej/mattermost-notification-confidentiality-10-6' into ↵ | Douwe Maan | 2018-04-05 | 5 | -0/+79 |
| |/ / | | | | | | | | | | | | | | | | | | | 'security-10-6' [10.6] Prevent notes on confidential issues from being sent to chat See merge request gitlab/gitlabhq!2366 # Conflicts: # app/helpers/services_helper.rb | ||||
| * | | Merge branch '41967_issue_api_closed_by_info' into 'master' | Sean McGivern | 2018-03-30 | 2 | -0/+22 |
| |\ \ | |/ |/| | | | | | Add closed by information to issue API See merge request gitlab-org/gitlab-ce!17042 | ||||
| | * | schema version change | haseeb | 2018-02-28 | 1 | -1/+1 |
| | | | |||||
| | * | schema version change | haseeb | 2018-02-28 | 1 | -1/+1 |
| | | | |||||
| | * | added forign key and specs | haseeb | 2018-02-28 | 2 | -1/+10 |
| | | | |||||
| | * | closed by field added | haseeb | 2018-02-28 | 1 | -0/+13 |
| | | | |||||
| * | | Merge branch 'add-per-runner-job-timeout' into 'master' | Kamil Trzciński | 2018-03-29 | 3 | -0/+42 |
| |\ \ | | | | | | | | | | | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221 | ||||
| | * | | Add explicit primary key for ci_builds_metadata table | Tomasz Maczukin | 2018-03-28 | 2 | -3/+5 |
| | | | | |||||
| | * | | Add project_id column to Ci::BuildMetadata | Tomasz Maczukin | 2018-03-28 | 2 | -0/+8 |
| | | | | |||||
| | * | | Rename used_timeout to timeout | Tomasz Maczukin | 2018-03-28 | 2 | -3/+3 |
| | | | | |||||
| | * | | Rename maximum_job_timeout to maximum_timeout | Tomasz Maczukin | 2018-03-28 | 3 | -10/+10 |
| | | | | |||||
| | * | | Refactorize Ci::Build and Ci::BuildMetadata models | Tomasz Maczukin | 2018-03-28 | 3 | -21/+8 |
| | | | | |||||
| | * | | Move job timeout information to new ci_builds_metadata table | Tomasz Maczukin | 2018-03-28 | 4 | -13/+36 |
| | | | | |||||
| | * | | Change timeout_source to enum | Tomasz Maczukin | 2018-03-28 | 2 | -2/+2 |
| | | | | |||||
| | * | | Use change instead of up/down in simple migrations | Tomasz Maczukin | 2018-03-28 | 2 | -11/+2 |
| | | | | |||||
| | * | | Show timeout information on job's page | Tomasz Maczukin | 2018-03-28 | 2 | -0/+17 |
| | | | | |||||
| | * | | Rename job_upper_timeout to maximum_job_timeout | Tomasz Maczukin | 2018-03-28 | 3 | -14/+14 |
| | | | | |||||
| | * | | Add new column to ci_runners table | Tomasz Maczukin | 2018-03-28 | 2 | -0/+14 |
| | | | | |||||
| * | | | Add the RedirectRoute#path index setup_postgresql | Bob Van Landuyt | 2018-03-28 | 1 | -9/+9 |
| | | | | |||||
| * | | | Add index on lower path to redirect routes | Bob Van Landuyt | 2018-03-28 | 1 | -0/+38 |
| | | | | | | | | | | | | | | | | This will speed up the LIKE query in RedirectRoute.matching_path_and_descendants | ||||
| * | | | Remove `permanent` from `redirect_routes` | Bob Van Landuyt | 2018-03-28 | 2 | -1/+37 |
| |/ / | | | | | | | | | | | This removes the column that was added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15670 since we will no longer be allowing _permanent_ redirects | ||||
| * | | Remove unused index from events table. | Andreas Brandl | 2018-03-27 | 2 | -2/+19 |
| | | | | | | | | | Closes #44467. | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |