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 | 2 | -0/+36 |
| | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287 | ||||
* | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'" | Douwe Maan | 2017-05-15 | 2 | -36/+0 |
| | | | This reverts merge request !11287 | ||||
* | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' | Douwe Maan | 2017-05-15 | 2 | -0/+36 |
|\ | | | | | | | | | | | | | 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 | 2 | -0/+36 |
| | | |||||
* | | Merge branch 'enable-auto-cancelling-by-default' into 'master' | Kamil Trzciński | 2017-05-15 | 1 | -0/+13 |
|\ \ | | | | | | | | | | | | | | | | | | | Make auto-cancelling pending pipelines on by default Closes #30656 See merge request !11023 | ||||
| * | | Move to post_migrate and use update_column_in_batches | Lin Jen-Shin | 2017-05-15 | 1 | -14/+0 |
| | | | |||||
| * | | Make auto-cancelling pending pipelines on by default | Lin Jen-Shin | 2017-05-15 | 2 | -0/+27 |
| |/ | |||||
* | | Merge remote-tracking branch 'upstream/master' into ↵ | Lin Jen-Shin | 2017-05-15 | 6 | -2/+62 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+15 |
| | | |||||
| * | 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 | 2 | -0/+37 |
| | | | | | | | | | | Variables shouldn't exist without a project, so a foreign key was added with CASCADE'ing effects. | ||||
| * | Merge branch 'retried-in-database-mysql' into 'master' | Regis Boudinot | 2017-05-10 | 1 | -0/+9 |
| |\ | | | | | | | | | | | | | | | | | | | Retried in database Closes #25737 See merge request !11115 | ||||
| | * | Make retried to be nullable | Kamil Trzcinski | 2017-05-09 | 1 | -8/+2 |
| | | | |||||
| | * | Store retried in database for CI buildsretried-in-database-mysql | Kamil Trzcinski | 2017-05-07 | 1 | -0/+15 |
| | | | |||||
| * | | 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> | ||||
* | | | Merge branch 'master' into 'add-index-for-auto_canceled_by_id-mysql' | Kamil Trzciński | 2017-05-09 | 7 | -0/+114 |
|\ \ \ | |/ / | | | | | | | # Conflicts: # db/schema.rb | ||||
| * | | Small code improvements and add migration spec | Felipe Artur | 2017-05-08 | 1 | -0/+0 |
| | | | |||||
| * | | Preloads head pipeline for each merge request | Felipe Artur | 2017-05-08 | 1 | -0/+7 |
| | | | |||||
| * | | Add Pipeline Schedules that supersedes experimental Trigger Schedule | Zeger-Jan van de Weg | 2017-05-07 | 6 | -0/+107 |
| |/ | |||||
* | | 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 | 14 | -0/+285 |
|\ \ | |/ | | | | | # Conflicts: # db/schema.rb | ||||
| * | Merge branch '17361-redirect-renamed-paths' into 'master' | Sean McGivern | 2017-05-06 | 3 | -0/+64 |
| |\ | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+29 |
| | | | |||||
| | * | Add index for source association and for path | Michael Kozono | 2017-05-05 | 1 | -0/+22 |
| | | | |||||
| | * | Redirect from redirect routes to canonical routes | Michael Kozono | 2017-05-05 | 1 | -0/+15 |
| | | | |||||
| * | | Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable' | Sean McGivern | 2017-05-05 | 2 | -0/+28 |
| |\ \ | |||||
| | * | | Add alias_attributes for notes | blackst0ne | 2017-05-04 | 1 | -14/+0 |
| | | | | |||||
| | * | | Add last_edited_at and last_edited_by attributes | blackst0ne | 2017-05-04 | 3 | -0/+42 |
| | | | | |||||
| * | | | Merge branch 'mia_backort' into 'master' | Jacob Schatz | 2017-05-05 | 2 | -0/+92 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | 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 | 3 | -0/+38 |
| | |\ \ | | | | | | | | | | | | | | | | skip] | ||||
| | * | | | [Multiple issue assignee] Fix a number of specs | Valery Sizov | 2017-05-05 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Backport of multiple_assignees_feature [ci skip] | Valery Sizov | 2017-05-04 | 2 | -0/+92 |
| | | | | | |||||
| * | | | | Merge branch 'add-sentry-js-again-with-vue' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+33 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Add sentry JS See merge request !6764 | ||||
| | * | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-05-04 | 2 | -0/+22 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | | | | clientside_sentry migration and schema changes commit | Luke "Jared" Bennett | 2017-05-04 | 1 | -0/+33 |
| | | | | | | |||||
| | * | | | | Reset migration to head | Luke "Jared" Bennett | 2017-05-04 | 2 | -96/+0 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-04 | 2 | -0/+15 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Reset schema and migration | Luke "Jared" Bennett | 2017-05-04 | 1 | -0/+65 |
| | | | | | | |||||
| | * | | | | [ci skip] Update migration to be reversible and use add_column_with_default | Luke "Jared" Bennett | 2017-05-03 | 1 | -9/+28 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-03 | 12 | -0/+26 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Added migration downtime tag | Luke "Jared" Bennett | 2017-04-28 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-04-28 | 3 | -0/+41 |
| | |\ \ \ \ | |||||
| | * | | | | | Added migration | Luke "Jared" Bennett | 2017-04-28 | 1 | -0/+9 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-04 | 4 | -0/+37 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb | ||||
| | * | | | | | Add index to last_repository_updated_at on projects | Douglas Barbosa Alexandre | 2017-05-04 | 1 | -0/+15 |
| | | | | | | | |||||
| | * | | | | | Add last_repository_updated_at to projects | Douglas Barbosa Alexandre | 2017-05-04 | 1 | -0/+7 |
| | | |_|_|/ | | |/| | | | |||||
| | * | | | | Fix caching large snippet HTML content on MySQL databases | Nick Thomas | 2017-05-03 | 2 | -0/+15 |
| | | |_|/ | | |/| | | |||||
| * | | | | First round of updates from the code review. | Ruben Davila | 2017-05-02 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-02 | 19 | -0/+145 |
| |\ \ \ \ | | |/ / / |