Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458c | Douwe Maan | 2017-05-16 | 5 | -3/+75 |
| | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287 | ||||
* | Merge branch 'zj-pipeline-schedule-owner' into 'master' | Kamil Trzciński | 2017-05-16 | 2 | -1/+37 |
|\ | | | | | | | | | | | | | Foreign key for Pipeline schedule owner Closes #31932 See merge request !11233 | ||||
| * | Add foreign key on pipeline_schedules.owner_idzj-pipeline-schedule-owner | Z.J. van de Weg | 2017-05-15 | 2 | -1/+37 |
| | | | | | | | | | | | | Set to nullify, so the settings remain if the user is deleted. Fixes gitlab-org/gitlab-ce#31932 | ||||
* | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'" | Douwe Maan | 2017-05-15 | 5 | -75/+3 |
| | | | | | | This reverts merge request !11287 | ||||
* | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' | Douwe Maan | 2017-05-15 | 5 | -3/+75 |
|\ \ | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287 | ||||
| * | | Rename `build_events` columns to `job_events` | Bob Van Landuyt | 2017-05-15 | 5 | -3/+75 |
| |/ | |||||
* | | Merge branch 'enable-auto-cancelling-by-default' into 'master' | Kamil Trzciński | 2017-05-15 | 3 | -1/+29 |
|\ \ | | | | | | | | | | | | | | | | | | | Make auto-cancelling pending pipelines on by default Closes #30656 See merge request !11023 | ||||
| * | | Disable transaction for updating the table | Lin Jen-Shin | 2017-05-15 | 1 | -0/+2 |
| | | | |||||
| * | | Move to post_migrate and use update_column_in_batches | Lin Jen-Shin | 2017-05-15 | 1 | -2/+1 |
| | | | |||||
| * | | Make auto-cancelling pending pipelines on by default | Lin Jen-Shin | 2017-05-15 | 3 | -1/+28 |
| |/ | |||||
* | | Add missing newline in schema | Lin Jen-Shin | 2017-05-15 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into ↵ | Lin Jen-Shin | 2017-05-15 | 9 | -5/+144 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-index-for-auto_canceled_by_id-mysql * upstream/master: (224 commits) Added balsamiq jasmine integration test Add support for deltas_only under Gitaly Codestyle Update CHANGELOG.md for 9.1.4 Update CHANGELOG.md for 9.1.4 Update CHANGELOG.md for 9.1.4 Update CHANGELOG.md for 9.1.4 Minor cosmetic fixes in hooks admin screen Documentation for repository_update_events Changelog Update SystemHooks API to expose and handle new repository_update_events Make the new repository_update_events configurable in System Hooks UI Added repository_update hook Wait for requests after each Spinach scenario instead of feature Remove trailing comma in dependency linker to satisfy Rubocop Fix specs New branch new mr docs Relax rake backup regex to handle CE and EE RCs Fix conflict resolution from corrupted upstream Removed all instances of Object.assign by using es6 classes, also includes some … ... | ||||
| * | Added repository_update hook | Gabriel Mazetto | 2017-05-12 | 2 | -0/+16 |
| | | |||||
| * | Merge branch 'zj-clean-up-ci-variables-table' into 'master' | Yorick Peterse | 2017-05-11 | 3 | -3/+40 |
| |\ | | | | | | | | | | | | | | | | | | | Clean up ci variables table Closes #31799 See merge request !11186 | ||||
| | * | Remove rails dependent: :destroy statement | Z.J. van de Weg | 2017-05-11 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | Enforced by the database, and no callbacks need to be called. Combined with 7b9b2c6099 and 294a8b8a6d this resolves gitlab-org/gitlab-ce#31799 | ||||
| | * | Add a foreign key to ci_variables to projects | Z.J. van de Weg | 2017-05-11 | 3 | -3/+29 |
| | | | | | | | | | | | | | | | Variables shouldn't exist without a project, so a foreign key was added with CASCADE'ing effects. | ||||
| | * | Prevent NULL values on ci_variables columns | Z.J. van de Weg | 2017-05-11 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be more specific; key, and project_id. If either of these is NULL its wrong, because: 1. storing a key value pair without key is just plain wrong 2. all variables should belong to a project Non of these cases existed on the staging database. | ||||
| * | | Fix MySQL build failuredm-fix-mysql-failure | Douwe Maan | 2017-05-10 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'retried-in-database-mysql' into 'master' | Regis Boudinot | 2017-05-10 | 3 | -0/+39 |
| |\ | | | | | | | | | | | | | | | | | | | Retried in database Closes #25737 See merge request !11115 | ||||
| | * | Make retried to be nullable | Kamil Trzcinski | 2017-05-09 | 3 | -10/+4 |
| | | | |||||
| | * | Store retried in database for CI buildsretried-in-database-mysql | Kamil Trzcinski | 2017-05-07 | 3 | -0/+45 |
| | | | |||||
| * | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵ | Robert Speicher | 2017-05-10 | 2 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063 | ||||
| | * | | Enable the Style/TrailingCommaInLiteral cop | Rémy Coutable | 2017-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | No user needed to cleanup namespaceless pending delete projects | Toon Claes | 2017-05-10 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | | | | | Since this is a cleanup, ran by a post-deploy, there is no need to lookup the admin to run the cleanup. | ||||
| * | | | Use worker to destroy namespaceless projects in post-deploy | Toon Claes | 2017-05-10 | 2 | -44/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroying projects can be very time consuming. So instead of destroying them in the post-deploy, just schedule them and make Sidekiq do the hard work. They are scheduled in batches of 5000 records. This way the number of database requests is limited while also the amount data read to memory is limited. | ||||
| * | | | No user is needed to delete a project | Toon Claes | 2017-05-10 | 1 | -4/+1 |
| | | | | |||||
| * | | | Add post-deploy migrate to cleanup projects in pending delete state | Toon Claes | 2017-05-10 | 1 | -0/+47 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are many projects in `pending_delete` state, this post-deploy migration cleans them up. The script is based on https://gitlab.com/gitlab-org/gitlab-ce/snippets/1648654 and https://gitlab.com/gitlab-org/gitlab-ce/snippets/1611429. The use of these scripts were described in https://gitlab.com/gitlab-com/infrastructure/issues/888. | ||||
* | | | Merge branch 'master' into 'add-index-for-auto_canceled_by_id-mysql' | Kamil Trzciński | 2017-05-09 | 11 | -26/+242 |
|\ \ \ | |/ / | | | | | | | # Conflicts: # db/schema.rb | ||||
| * | | Small code improvements and add migration spec | Felipe Artur | 2017-05-08 | 3 | -2/+1 |
| | | | |||||
| * | | Fix specs 2 | Felipe Artur | 2017-05-08 | 1 | -12/+14 |
| | | | |||||
| * | | Populate merge requests head_pipeline_id | Felipe Artur | 2017-05-08 | 2 | -1/+24 |
| | | | |||||
| * | | Preloads head pipeline for each merge request | Felipe Artur | 2017-05-08 | 2 | -0/+9 |
| | | | |||||
| * | | Add Pipeline Schedules that supersedes experimental Trigger Schedule | Zeger-Jan van de Weg | 2017-05-07 | 9 | -26/+209 |
| |/ | |||||
* | | Merge branch 'master' into 'add-index-for-auto_canceled_by_id-mysql'add-index-for-auto_canceled_by_id-mysql | Kamil Trzciński | 2017-05-06 | 17 | -3/+382 |
|\ \ | |/ | | | | | # Conflicts: # db/schema.rb | ||||
| * | Merge branch '17361-redirect-renamed-paths' into 'master' | Sean McGivern | 2017-05-06 | 4 | -0/+76 |
| |\ | | | | | | | | | | | | | | | | | | | Resolve "Redirect to new project link after a rename" Closes #17361 and #30317 See merge request !11136 | ||||
| | * | Resolve discussions | Michael Kozono | 2017-05-05 | 1 | -3/+2 |
| | | | |||||
| | * | Fix Rubocop failures | Michael Kozono | 2017-05-05 | 1 | -1/+0 |
| | | | |||||
| | * | Index redirect_routes path for LIKE | Michael Kozono | 2017-05-05 | 2 | -0/+30 |
| | | | |||||
| | * | Add index for source association and for path | Michael Kozono | 2017-05-05 | 2 | -1/+26 |
| | | | |||||
| | * | Redirect from redirect routes to canonical routes | Michael Kozono | 2017-05-05 | 2 | -0/+23 |
| | | | |||||
| * | | Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable' | Sean McGivern | 2017-05-05 | 3 | -1/+33 |
| |\ \ | |||||
| | * | | Add alias_attributes for notes | blackst0ne | 2017-05-04 | 2 | -16/+0 |
| | | | | |||||
| | * | | Add last_edited_at and last_edited_by attributes | blackst0ne | 2017-05-04 | 4 | -1/+49 |
| | | | | |||||
| * | | | Merge branch 'mia_backort' into 'master' | Jacob Schatz | 2017-05-05 | 4 | -1/+103 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | Backport of Multiple Assignees feature See merge request !11089 | ||||
| | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵ | Valery Sizov | 2017-05-05 | 5 | -1/+49 |
| | |\ \ | | | | | | | | | | | | | | | | skip] | ||||
| | * | | | [Multiple issue assignee] Fix a number of specs | Valery Sizov | 2017-05-05 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Backport of multiple_assignees_feature [ci skip] | Valery Sizov | 2017-05-04 | 4 | -1/+103 |
| | | | | | |||||
| * | | | | Merge branch 'add-sentry-js-again-with-vue' into 'master' | Phil Hughes | 2017-05-05 | 2 | -2/+37 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Add sentry JS See merge request !6764 | ||||
| | * | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-05-04 | 4 | -1/+32 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | | | | clientside_sentry migration and schema changes commit | Luke "Jared" Bennett | 2017-05-04 | 2 | -1/+36 |
| | | | | | |