summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backports every CE related change from ee-5484 to CE42099-port-push-mirroring-to-ce-ce-portTiago Botelho2018-05-0434-5/+1683
* Backports every CE related change from ee-44542 to CETiago Botelho2018-05-0338-115/+610
* Merge branch '5480-sidebar-subscription-event-handling' into 'master'Phil Hughes2018-05-024-11/+11
|\
| * Consume `toggleSubscription` event directly from Subscriptions componentKushal Pandya2018-05-022-9/+2
| * Emit `toggleSubscription` event on component instead of eventHubKushal Pandya2018-05-022-2/+9
* | Merge branch 'improve-quick-actions-summary-preview' into 'master'Tim Zallmann2018-05-022-0/+15
|\ \ | |/ |/|
| * Improve quick actions summary previewGeorge Tsiolis2018-05-012-0/+15
* | Merge branch 'blackst0ne-replace-spinach-project-source-markdown-render.featu...Rémy Coutable2018-05-026-661/+337
|\ \
| * | Replace the `project/source/markdown_render.feature` spinach test with an rsp...blackst0ne2018-05-026-661/+337
|/ /
* | Merge branch 'blackst0ne-rails5-fix-create-service-spec' into 'master'Rémy Coutable2018-05-021-5/+9
|\ \
| * | [Rails5] Fix spec/services/applications/create_service_spec.rbblackst0ne2018-05-021-5/+9
|/ /
* | Merge branch 'blackst0ne-rails5-fix-notification-setting-spec' into 'master'Rémy Coutable2018-05-021-1/+6
|\ \
| * | [Rails5] Fix spec/models/notification_setting_spec.rbblackst0ne2018-05-011-1/+6
* | | Merge branch 'blackst0ne-rails5-fix-enum-question-mark-methods' into 'master'Rémy Coutable2018-05-022-0/+18
|\ \ \
| * | | [Rails5] Fix enum question mark methodsblackst0ne2018-05-022-0/+18
|/ / /
* | | Merge branch 'feature/display-active-sessions' into 'master'Douwe Maan2018-05-0223-47/+642
|\ \ \
| * | | Display and revoke active sessionsAlexis Reigel ( 🌴 may 2nd - may 9th 🌴 )2018-05-0223-47/+642
|/ / /
* | | Merge branch 'blackst0ne-rails5-fix-requests-specs' into 'master'Rémy Coutable2018-05-023-7/+7
|\ \ \
| * | | [Rails5] Fix `undefined method 'downcase'` errors in requests specsblackst0ne2018-04-293-7/+7
* | | | Merge branch 'blackst0ne-rails5-add-touch-later-to-commit-model' into 'master'Rémy Coutable2018-05-021-0/+6
|\ \ \ \
| * | | | [Rails5] Add `touch_later` to `Commit` modelblackst0ne2018-04-291-0/+6
| |/ / /
* | | | Merge branch 'blackst0ne-rails5-fix-arel-update-manager' into 'master'Rémy Coutable2018-05-023-5/+27
|\ \ \ \
| * | | | [Rails5] Fix Arel::UpdateManagerblackst0ne2018-04-293-5/+27
| |/ / /
* | | | Merge branch 'blackst0ne-rails5-fix-tzinfo-invalid-timezone-identifier' into ...Rémy Coutable2018-05-021-1/+7
|\ \ \ \
| * | | | [Rails5] Fix TZInfo::InvalidTimezoneIdentifier exceptionblackst0ne2018-04-291-1/+7
| |/ / /
* | | | Merge branch 'blackst0ne-rails5-use-safe-params-instead-of-params-in-url-for-...Rémy Coutable2018-05-025-5/+5
|\ \ \ \
| * | | | [Rails5] Use `safe_params` instead of `params` in `url_for` helpersblackst0ne2018-04-285-5/+5
| |/ / /
* | | | Merge branch 'blackst0ne-rails5-update-application-controller-log-exception' ...Rémy Coutable2018-05-021-1/+2
|\ \ \ \
| * | | | [Rails5] Update `ApplicationController#log_exception` to fix `undefined metho...blackst0ne2018-04-281-1/+2
| |/ / /
* | | | Merge branch 'make-job-lfs-artifacts-read-only' into 'master'Douwe Maan2018-05-028-22/+20
|\ \ \ \
| * | | | Fix file_store for artifacts and lfs when savingKamil Trzciński2018-05-018-22/+20
* | | | | Merge branch 'blackst0ne-rails5-fix-delete-user-worker' into 'master'Rémy Coutable2018-05-022-8/+5
|\ \ \ \ \
| * | | | | Update `Gemfile.rails5.lock`blackst0ne2018-04-281-4/+1
| * | | | | [Rails5] Fix `params` for DeleteUserWorkerblackst0ne2018-04-282-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'jr-33320-lfs-settings-interface' into 'master'Douwe Maan2018-05-025-44/+44
|\ \ \ \ \
| * | | | | Enable LFS setting UI for Masters and OwnersJames Ramsay2018-05-015-44/+44
* | | | | | Merge branch 'backstage/gb/migrate-pipeline-stages-index' into 'master'Kamil Trzciński2018-05-0217-8/+234
|\ \ \ \ \ \
| * | | | | | Use stages position column to track stage indexGrzegorz Bizon2018-05-0114-27/+27
| * | | | | | Merge branch 'master' into backstage/gb/migrate-pipeline-stages-indexGrzegorz Bizon2018-05-01281-2001/+2783
| |\ \ \ \ \ \
| * | | | | | | Update 20180420080616_schedule_stages_index_migration.rbGrzegorz Bizon2018-04-271-1/+1
| * | | | | | | Add temporary partial stage priority index to schemaGrzegorz Bizon2018-04-251-0/+1
| * | | | | | | Merge branch 'master' into 'backstage/gb/migrate-pipeline-stages-index'Grzegorz Bizon2018-04-25180-666/+2745
| |\ \ \ \ \ \ \
| * | | | | | | | Add temporary build stage priority partial indexGrzegorz Bizon2018-04-251-0/+16
| * | | | | | | | Rename stage index column name to priority columnGrzegorz Bizon2018-04-2413-24/+24
| * | | | | | | | Improve stages index migration code readabilityGrzegorz Bizon2018-04-241-10/+10
| * | | | | | | | Revert smallint stage index field, due to incompatible rangeGrzegorz Bizon2018-04-241-1/+1
| * | | | | | | | Update stages index migration batch sizeGrzegorz Bizon2018-04-241-1/+1
| * | | | | | | | Improve performance of stages index migration on PostgreSQLGrzegorz Bizon2018-04-241-9/+28
| * | | | | | | | Use smallint for stage index columnGrzegorz Bizon2018-04-241-1/+1
| * | | | | | | | Use database query to calculate average stage positionGrzegorz Bizon2018-04-242-10/+26