summaryrefslogtreecommitdiff
path: root/db
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-051-1/+1
|\
| * Fix up merge issuesfix-realtime-edited-text-for-issues-9-3Luke "Jared" Bennett2017-06-021-1/+1
* | Merge branch 'sidekiq-transaction' into 'master'Sean McGivern2017-06-051-1/+10
|\ \
| * | Fix keys seedDouwe Maan2017-06-021-1/+10
| |/
* | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-053-0/+104
|\ \
| * | Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-013-0/+104
* | | Make sure that environment was created before deployingLin Jen-Shin2017-06-021-0/+4
* | | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-024-2/+100
|\ \ \ | | |/ | |/|
| * | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-012-1/+17
| |\ \
| | * | Make sure protected can't be null; Test protected!24196-protected-variablesLin Jen-Shin2017-06-011-2/+2
| | * | Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-015-4/+58
| | |\ \
| | * | | Update docs and use protected secret variable as the nameLin Jen-Shin2017-05-311-1/+1
| | * | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-3115-10/+213
| | |\ \ \
| | * \ \ \ Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-266-14/+67
| | |\ \ \ \
| | * | | | | Backend implementation for protected variablesLin Jen-Shin2017-05-252-1/+17
| * | | | | | Add missing specsKamil Trzcinski2017-06-011-5/+5
| * | | | | | Fix data inconsistency issue for old artifacts by moving them to a currently ...Kamil Trzcinski2017-06-011-0/+72
| | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'zj-drop-fk-if-exists' into 'master'Yorick Peterse2017-06-011-1/+11
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Only remove FK if it existszj-drop-fk-if-existsZ.J. van de Weg2017-06-011-1/+11
| | | |_|/ | | |/| |
* | | | | Fix other use of CreateDeploymentService and makeLin Jen-Shin2017-06-021-6/+3
* | | | | Just use the url from options, not saving it as a columnLin Jen-Shin2017-06-012-11/+1
* | | | | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-0119-14/+271
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-312-2/+46
| |\ \ \ \
| | * | | | Add feature toggles through FlipperAlejandro Rodríguez2017-05-312-1/+45
| | |/ / /
| * | | | Introduce source to pipeline entitytrigger-sourceKamil Trzcinski2017-05-314-3/+13
| |/ / /
| * | | Merge branch '32677-migrations-using-update_column_in_batches-must-have-a-spe...Robert Speicher2017-05-2910-9/+10
| |\ \ \
| | * | | Disable Migration/UpdateColumnInBatches for old migrations32677-migrations-using-update_column_in_batches-must-have-a-specRémy Coutable2017-05-2910-9/+10
| | | |/ | | |/|
| * | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-295-1/+203
| |\ \ \ | | |/ / | |/| |
| | * | Index project_group_links.group_idYorick Peterse2017-05-172-0/+21
| | * | Convert nested groups to regular ones for MySQLYorick Peterse2017-05-171-0/+123
| | * | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-173-1/+59
* | | | Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'Lin Jen-Shin (godfat)2017-05-266-14/+67
|\ \ \ \ | |/ / /
| * | | Merge branch '32851-fix-postgres-9-1' into 'master'Douwe Maan2017-05-253-13/+5
| |\ \ \
| | * | | Only use DROP INDEX CONCURRENTLY on postgreql 9.2+Nick Thomas2017-05-253-13/+5
| * | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-252-0/+40
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Implement web hooks loggingAlexander Randa2017-05-252-0/+40
| * | | | add rss_token attribute to user modelAlexis Reigel2017-05-242-1/+22
| | |_|/ | |/| |
* | | | Implement $CI_ENVIRONMENT_URL for jobsLin Jen-Shin2017-05-252-1/+11
|/ / /
* | | Address reviewDouwe Maan2017-05-241-18/+0
* | | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-232-1/+33
* | | Fix migrations for older PostgreSQL versionsfix-retried-for-postgresKamil Trzcinski2017-05-231-4/+6
* | | Fixes broken MySQL migration for retriedKamil Trzcinski2017-05-221-3/+26
* | | Merge branch 'bvl-fix-already-renamed-paths' into 'master'Douwe Maan2017-05-193-1/+155
|\ \ \
| * | | Rename users on mysqlbvl-fix-already-renamed-pathsBob Van Landuyt2017-05-191-4/+15
| * | | Don't try to rename `-`Bob Van Landuyt2017-05-191-1/+0
| * | | Simpler way of renaming usersBob Van Landuyt2017-05-191-9/+6
| * | | Fix incorrectly renamed routesBob Van Landuyt2017-05-192-1/+105
| * | | Rename users that had their namespace renamedBob Van Landuyt2017-05-192-1/+44
* | | | Add temporary partial index to speed up the migrationupdate-retried-migrationLin Jen-Shin2017-05-191-14/+28
|/ / /
* | | Adding NULL:false constraint with change_column_null instead of change_columnfix_set_null_false_migrationValery Sizov2017-05-181-4/+4