summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add action to deploymentadd-action-to-deployment-backupShinya Maeda2018-11-025-1/+29
|
* Fix specShinya Maeda2018-11-027-69/+69
|
* Remove unnecessary line in schema.rbShinya Maeda2018-11-021-1/+0
|
* Add partial index for filling deployment at migrationShinya Maeda2018-11-022-0/+20
|
* Fix fill empty finished at migrationShinya Maeda2018-11-022-11/+34
|
* Fix flaky specShinya Maeda2018-11-021-1/+1
|
* Fix guard clause to prevent multiple deployments to a jobShinya Maeda2018-11-022-3/+1
|
* Fix specShinya Maeda2018-11-021-4/+7
|
* Simplify the factoryShinya Maeda2018-11-021-4/+4
|
* Simplify the Deployable and BuildSuccessWorkerShinya Maeda2018-11-022-1/+3
|
* Fix specShinya Maeda2018-11-022-9/+2
|
* Fix weird virtual deployment statusShinya Maeda2018-11-022-27/+19
|
* Fix specShinya Maeda2018-11-023-5/+5
|
* Fix coding offenceShinya Maeda2018-11-021-2/+2
|
* Squashed commit of the following:Shinya Maeda2018-11-0251-386/+1029
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit ba9aede922e1643db3f06c56736d46d6d86d356b Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Nov 1 14:21:33 2018 +0900 Fix ambiguious factory specification in update deployment service spec commit 013afb5668cb30dc4ca5b21945c17b341e7ea7f9 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Nov 1 14:10:24 2018 +0900 Fix spec commit 78793670d049e2dfb5fc98177eb4d10f20b9310b Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 31 18:26:12 2018 +0900 Fix spec commit 73d27e87c66698f2e3a817bb8728f02475b7ba4f Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 31 16:22:14 2018 +0900 Fix index commit 8580a226ea68bf5e49b35bfb5f404968bbfaf8e9 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 31 15:34:57 2018 +0900 Fix deployment relationships in Ci::Build commit d6d28b55afd1179200b4f5188e0b53079ff3c1a7 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 31 15:27:53 2018 +0900 Fix spec commit 94eb754e2e1bb9a1fe627f86823f571a8298d27b Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 31 14:07:11 2018 +0900 Fix spec commit 0b30f80bcd08a7a06bdde3378ec1733f865284be Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 20:15:31 2018 +0900 Fix spec commit 466bdcdb6af8cdb475c9fa16bd7d1dff23b11e40 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 19:28:51 2018 +0900 Fix spec commit a7c3caac99139e70fe3f1f3d14856939fa25c527 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 17:33:47 2018 +0900 Fix factory commit cea28ae100532e6711ce1d22676719a94e2da8a0 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 16:28:18 2018 +0900 Drop leagacy success commit 3785d685eabc10b6597cf3db67bf08385ccf298a Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 15:37:28 2018 +0900 Remove unnecessary migration file commit 0d597fa46eeffdbb9a4afb53005a8183e433c6bf Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 15:35:53 2018 +0900 Fix schema.rb commit ec3c2abc6944e09f6410468ae5e356865ec7b02b Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 15:34:21 2018 +0900 Rename post migration file commit 0e7281885a84656acf95f0f423732680f8fec076 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 15:31:01 2018 +0900 Remove include EnumWithNil commit b3846d59c07e07275126c70361bde7f30810729e Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 15:05:50 2018 +0900 Decouple action commit c9f9ba4eae9ca1edc7d8751e1d2e0572cb222d9c Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 14:23:29 2018 +0900 Remove status mock commit d95bfea1ca67b3a27a3226a669c2b1266d696682 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 14:17:14 2018 +0900 Add action commit 0cec39e0f76c22a18498f46d65ad7226fb30c3f8 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 30 13:44:07 2018 +0900 Remove unnecessary line in schema.rb commit 7b4c5f8e1b00dd8e6aa944352f9d8a9f3ae6f1c7 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 29 19:59:41 2018 +0900 Revert build success worker commit 0c52ffa4a23eea488c187317e8b400369846f399 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 29 19:11:47 2018 +0900 Use add_column_with_default properly commit ba9bae357da5dfd2f6ec05f7f9db9d0b31224f48 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 29 18:40:55 2018 +0900 Fix with_status commit 75dffc97b9c5f6fa73d9d09b125c8f849fa2caae Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 29 16:26:56 2018 +0900 Remove unnecessary line in schema.rb commit 25188ccc52fb29ca63b9205c4d95ffc2e0afadee Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 29 16:26:17 2018 +0900 Set default values in regular migration commit 98ea037fbf39c8d9f0db77fb50e2d08382425158 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 26 17:27:49 2018 +0900 Fix static analysis commit e7d1765f77f9ff9b94a34985a7855bdaab1da675 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 26 16:37:10 2018 +0900 Remove empty spec commit 0033f521ed1eae8117dba231961aa47c068bbcfb Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 26 16:34:55 2018 +0900 Simplify spec changes commit 0be4c6b3ade6d9a8bf28bcd177c66ebd7bb7d20a Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 26 16:32:45 2018 +0900 Simplify spec changes commit a93d25d79df7e25bdf688fc938c712922f9dc4df Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 26 16:02:31 2018 +0900 Fix flaky spec commit 339ad50cf471ca706b29f008ccd2bb881dd5b776 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 26 15:06:22 2018 +0900 Rename Deployments Success worker commit bd69c78085adcb9b0f8ff9b7041ae355953ad7ab Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 26 14:43:03 2018 +0900 Fix coding offence commit 004748b2a9c5236ec13eb01289418f3d6571c92c Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 25 20:09:10 2018 +0900 Rename to update deployment service commit b04a85e761de501f030f3844fd485a2b9e46f7f7 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 25 18:46:52 2018 +0900 Add spec for Project commit 548af23a5a07f0c20b72849d03aa0b98a0b49134 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 25 18:43:25 2018 +0900 Fix spec commit c977e4d3f17194c46a1bf857b473017ce21ef7e9 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 25 17:58:07 2018 +0900 Add spec for Environment commit 73feb9010f8d8093bee4b46e56d30cfef3e8e34a Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 25 17:39:24 2018 +0900 Add spec for Deployment model commit 9a3cfbf766f402571588839375cf311bb9807035 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 25 17:18:02 2018 +0900 Fix statis analysis commit a30d28dbc631a29855883ca89c592a10c012f1d2 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 25 17:17:32 2018 +0900 Ignore nil instance commit fa6fdd89f380e588a6bcf14b1f9aef0d14d3854b Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 25 16:20:40 2018 +0900 Add spec for deployable concern commit aa91186821dc671df2c7a641e37586dd5dfc1008 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 25 15:37:23 2018 +0900 Clean up deployable commit 34d3e18731f7906a3db250b105a64d1db83c2fca Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 25 15:13:05 2018 +0900 Fix 17 cycle analytics commit 8dc9e00408f9b390175e7d5ea743eed4fb9e3f79 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 25 13:56:51 2018 +0900 Fix static analysys commit 5c4175807a537bafc4b889b0a97e8f96f0e483cd Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 24 15:05:05 2018 +0900 Skip unnecessary sidekiq worker commit 9d8b5d423f49cc247c96ce3767d03b4af305809f Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 24 14:53:13 2018 +0900 Add changelog commit c8cabba496722240cadf7c161c80bceb09727cba Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 24 14:44:45 2018 +0900 Squashed commit of the following: commit f7643885ac2329e18d690a4e4f2d7614b732c793 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 23 19:38:45 2018 +0900 Fix deployment widget specs commit 03bd04b5c98b634dff6a0ab4292c150a9031995c Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 23 17:50:16 2018 +0900 Fix env status spec commit 4a49c6502b161a12f0f62d5ec167dff777047dab Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 23 17:48:59 2018 +0900 Fix environment spec commit 4044822887987e20a703990ff20352a532eeb965 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 23 17:47:17 2018 +0900 Fix environment spec commit 9939d44b7eb9da371de74c0f04fed1eb3db37ad3 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 23 15:45:43 2018 +0900 Add a new spec for deployment success worker commit f61c4d3657b5ef13b5da171460da68a6643ad4b5 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 23 15:38:11 2018 +0900 Fix cycle analytics helper commit b6242615e8298fb7fc047c8df8006c25ad717c70 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 23 14:41:54 2018 +0900 Fix cycle analysis helper commit 9a001cb4c4ed6f3b87dc612bdffc60a6b2b0a132 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 23 14:37:08 2018 +0900 Ignore coding offence in build success worker's spec commit 1fb88583025bac8a56172cbd59be04258ea4c5f3 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 23 14:33:11 2018 +0900 Added more spec for deployments commit 1a6ba97ababbf62e8dd0ae0c56d75ab1268fd0ce Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 19:36:50 2018 +0900 Move after create hookd into success worker commit 09de5fed5d6f108423779cf9d9e7f1d21f3c1c91 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 19:30:06 2018 +0900 Fix build spec commit 73a55cbcabbb1e928eca3e53e8ff75dec178bc90 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 19:08:43 2018 +0900 Fix update_deployment_metrics_service_spec.rb commit ee05136a02ae9fa348b4b89b9a69937ebb9697dd Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 17:32:05 2018 +0900 Remove unnecessary degelate commit e246ddeebc01a807ccc36fdb484c3e72ad91e680 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 16:07:39 2018 +0900 Remove unnecessary optimistic locking commit dcc225c8237b90e3bc8dcc3dc2e3252e0b0be093 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 16:00:22 2018 +0900 Simplify status replication commit 13a5fd7afb67ba2712fcaecaea5fedf05f9ad177 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 15:29:24 2018 +0900 Fix sidekiq queue names commit dcc796f48d523538e1c91b9cd3e1c7065e5329b1 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 15:23:55 2018 +0900 Revert success check in update_merge_request_metrics commit 129ef083d637d4acb8c97a6d9ab96deb2ff6efcd Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 15:18:31 2018 +0900 Fix queue name of deployment success worker commit 10fe5a6484f4f02322ce5bb16844fc7b1d565963 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 15:09:42 2018 +0900 Introduce deployable module commit d91260bbe105bf46f6c06d9e9593c8c4cd5139cf Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 14:05:31 2018 +0900 Add database index for successful deployments commit 74274147263de4b60870065a19935498ce662e30 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Oct 22 13:51:59 2018 +0900 Fix invalid state transition commit ff18463cc847bf3cf5a3e49f3651eedfdf67c7e6 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 19 20:05:15 2018 +0900 Fix coding style offence commit 0202c0f5b631601edab7b359b087b307f5eb7ba3 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 19 18:34:07 2018 +0900 Target only successful deployments from other relations commit 1f2758cb030dec1df5dda30f6bc3e25b6d0841c9 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 19 18:21:28 2018 +0900 Add namespace explicitly commit 3d9227b6e5642cecde88d4edac925125f6474b11 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 19 17:42:30 2018 +0900 Fix spec in DeleteInconsistentInternalIdRecords commit 3e0cc99ff6c5c7188511618228a6ec027752ce69 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 19 16:10:16 2018 +0900 Fixed spec commit 8de09b8bb31f7b9f24ecdf9f2dd8ef358a260263 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 19 14:22:35 2018 +0900 Fix create deployment service commit 31957570b4444492eeb412e765f96a56416c25f3 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 18 20:21:26 2018 +0900 Move CreateDeploymentService. Fix Cycle analytics spec and fixture. commit d2eb433a1bb9710c0d4778c4f34c12b6b64f60e6 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 18 20:11:22 2018 +0900 Fix build success worker commit 25e6cd87138bcdb69de8785ca367e479c8dbcc59 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 18 19:49:13 2018 +0900 Fix create deployment service spec commit d268bf410bf65e86c81eb76d50aa8e145b32d249 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 18 19:01:23 2018 +0900 Fix cycle analysys spec's deployment commit 525ade8aa1e4394ed8a759bb0437e407fbe74a35 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 18 18:24:04 2018 +0900 Fix factory to set legacy status by default commit c6a990821ac0a1ffa49e20e2d78d94b8ce075914 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 18 17:25:40 2018 +0900 Remove unnecessary lib from deployment commit a6107e0e85ac26ee09da3316ebc11de32f067d82 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 17 17:38:58 2018 +0900 Fix recursive call commit 15c5f3b64061a75af3c3039ca7f49b1cc4ff3068 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 17 17:30:44 2018 +0900 Add finished_at commit c8d3d70366f694d78acb7e30d342c7697798b922 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 17 15:55:31 2018 +0900 Fix last_deployment methods as it used to return successful deployment always commit 96bbe8670cece021766fde95fe573cbbe23d1e55 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 17 15:49:57 2018 +0900 Redefine statuses commit c86a9d0bd2ab3e7a00bf61f094a96ee99b76b289 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 17 14:50:27 2018 +0900 Fix schema.rb commit 9ff5f0eaafbc08795018c7bb282b19f6327dee21 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 17 14:18:04 2018 +0900 Default status nil to success commit 5928bd9bb94e1e8908ed1561e01595be84d5f4ec Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Oct 16 15:13:48 2018 +0900 Add status to Deployment
* Merge branch 'sh-link-bitbucket-server-import-docs' into 'master'Evan Read2018-11-011-1/+2
|\ | | | | | | | | Link Bitbucket Server from import index page See merge request gitlab-org/gitlab-ce!22752
| * Link Bitbucket Server from import index pagesh-link-bitbucket-server-import-docsStan Hu2018-11-011-1/+2
| |
* | Merge branch 'sh-fix-generators-not-always-working' into 'master'Robert Speicher2018-11-011-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Fix "rails g migration" not always using migration templates Closes #52651 See merge request gitlab-org/gitlab-ce!22592
| * | Fix "rails g migration" not always using migration templatessh-fix-generators-not-always-workingStan Hu2018-10-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally, this is what's supposed to happen when you invoke `rails g generate migration`: 1. `Rails.application.load_generators` is called here: https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/commands/commands_tasks.rb#L129 2. This loads the local `generator_templates` path in https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/generators.rb#L69. However, when metrics are enabled, the application is eager loaded here in the initializer. This short-circuits the `load_generators` and loads `ActiveRecord::Generators::MigrationGenerator` automatically, so the custom path is never loaded properly. With this change, we skip the initializing of metrics and eager loading if generators are in use. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52651
* | | Merge branch 'replace-tooltip-in-markdown-component' into 'master'Clement Ho2018-11-013-10/+15
|\ \ \ | | | | | | | | | | | | | | | | Replace tooltip in markdown component with gl-tooltip See merge request gitlab-org/gitlab-ce!21989
| * | | Replace tooltip in markdown component with gl-tooltipGeorge Tsiolis2018-10-313-10/+15
| | | |
* | | | Merge branch 'user-model-merge-conflicts' into 'master'Robert Speicher2018-11-012-2/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reduce merge conflicts in the User model See merge request gitlab-org/gitlab-ce!22697
| * | | | Use a method for the has_many :keys in Projectuser-model-merge-conflictsYorick Peterse2018-11-012-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the `where` in the `has_many :keys` association in Project to the Key model. This allows EE to override this method, instead of modifying the source code directly.
| * | | | Move LDAP sync time constant to a methodYorick Peterse2018-11-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the `1.hour` constant used as the LDAP sync time to a separate method. This allows EE to override this method using a module, instead of directly modifying the source code.
* | | | | Merge branch 'sh-bump-puma-memory-limits' into 'master'Robert Speicher2018-11-011-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reserve more RAM for master process in Puma See merge request gitlab-org/gitlab-ce!22741
| * | | | | Reserve more RAM for master process in Pumash-bump-puma-memory-limitsStan Hu2018-11-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Puma Worker Killer checks the total RAM used by both the master and worker processes. Bump the limits to N+1 instead of N workers to account for this.
* | | | | | Merge branch 'fix-for-assets-image' into 'master'Stan Hu2018-11-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use CI_COMMIT_REF_SLUG when building assets image See merge request gitlab-org/gitlab-ce!22756
| * | | | | | Use CI_COMMIT_REF_SLUG when building assets imagefix-for-assets-imageIan Baum2018-11-011-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * Using CI_COMMIT_REF_NAME fails when the branch or tag contains special characters
* | | | | | Merge branch 'ee-8121-geo-search-bar' into 'master'Douglas Barbosa Alexandre2018-11-011-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport from Added a search bar to `Admin > Geo > Projects` See merge request gitlab-org/gitlab-ce!22747
| * | | | | | Add render_if_exists to inject additional search field in EEGabriel Mazetto2018-11-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows EE code to reuse the search partial and append additional query parameters to it, and have it preserved when searching.
* | | | | | | Merge branch 'db-schema-merge-conflicts' into 'master'Robert Speicher2018-11-011-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Use merge_db_schema for db/schema.rb conflicts See merge request gitlab-org/gitlab-ce!22692
| * | | | | | Use merge_db_schema for db/schema.rb conflictsdb-schema-merge-conflictsYorick Peterse2018-11-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This Gem can be used to automatically resolve merge conflicts in db/schema.rb. To use it you still need to initialise the configuration, which can be done by running: merge_db_schema-init --force See https://gitlab.com/gitlab-org/release/framework/issues/42 for more information.
* | | | | | | Merge branch 'winh-job-list-dynamic-timer' into 'master'Clement Ho2018-11-013-3/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dynamic timer for delayed jobs in job list See merge request gitlab-org/gitlab-ce!22656
| * | | | | | | Add dynamic timer for delayed jobs in job listwinh-job-list-dynamic-timerWinnie Hellmann2018-11-013-3/+24
| | | | | | | |
* | | | | | | | Merge branch 'related_mrs' into 'master'Douglas Barbosa Alexandre2018-11-014-0/+184
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add referenced merge_requests endpoint Closes #39157 See merge request gitlab-org/gitlab-ce!21806
| * | | | | | | add related merge request endpointHelmut Januschka2018-11-014-0/+184
|/ / / / / / /
* | | | | | | Merge branch 'patch-31' into 'master'Achilleas Pipinellis2018-11-011-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes automatic URL formatting on Maven Page See merge request gitlab-org/gitlab-ce!22727
| * | | | | | | Fixes automatic URL formattingLyle Kozloff2018-10-311-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'Sean McGivern2018-11-0112-28/+142
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix testsHeinrich Lee Yu2018-11-016-33/+40
| | | | | | | |
| * | | | | | | Add changelog entryHeinrich Lee Yu2018-11-011-0/+5
| | | | | | | |
| * | | | | | | Add testsHeinrich Lee Yu2018-11-013-4/+46
| | | | | | | |
| * | | | | | | Add documentationHeinrich Lee Yu2018-11-012-17/+17
| | | | | | | |
| * | | | | | | Add None / Any options to search barHeinrich Lee Yu2018-11-012-0/+18
| | | | | | | |
| * | | | | | | Add None / Any options to reaction filter in issues / MRs APIHeinrich Lee Yu2018-11-012-10/+52
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'docs/fix-user-training' into 'master'Achilleas Pipinellis2018-11-011-136/+131
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve markdown and fix links that don't render correctly See merge request gitlab-org/gitlab-ce!22735
| * | | | | | | Improve markdown and fix links that don't render correctlydocs/fix-user-trainingEvan Read2018-11-011-136/+131
| |/ / / / / /
* | | | | | | Merge branch 'docs/fix-digital-ocean-docker' into 'master'Achilleas Pipinellis2018-11-011-54/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve markdown and fix links that don't render correctly See merge request gitlab-org/gitlab-ce!22737
| * | | | | | | Improve markdown and fix links that don't render correctlydocs/fix-digital-ocean-dockerEvan Read2018-11-011-54/+48
| |/ / / / / /
* | | | | | | Merge branch 'docs/fix-ux-guide-tips' into 'master'Achilleas Pipinellis2018-11-011-11/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve markdown and fix links that don't render correctly See merge request gitlab-org/gitlab-ce!22738
View Lorry Controller Status