summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'small-s-in-elasticsearch-in-code' into 'master'Rémy Coutable2019-06-281-1/+1
|\
| * Fix typo in code comments about ElasticsearchTakuya Noguchi2019-06-281-1/+1
* | Replace 'JIRA' with 'Jira'Takuya Noguchi2019-06-281-12/+12
* | Merge branch 'graphql-tree-last-commit' into 'master'Lin Jen-Shin2019-06-281-0/+5
|\ \
| * | Added commit type to tree GraphQL typePhil Hughes2019-06-281-0/+5
* | | Do not change updated_at on an issue when reordering on an issue boardEugenia Grieff2019-06-281-2/+2
* | | Merge branch '63212-n-1-queries-in-projects-id-boards-api' into 'master'Thong Kuah2019-06-282-1/+5
|\ \ \
| * | | Move order lambda to list scope63212-n-1-queries-in-projects-id-boards-apicharlieablett2019-06-272-2/+3
| * | | Compound lists scopes to preserve orderingcharlieablett2019-06-261-1/+1
| * | | Remove N+1 query for project and group boardscharlieablett2019-06-261-0/+3
* | | | Merge branch '62826-graphql-emoji-mutations' into 'master'Jan Provaznik2019-06-281-0/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | GraphQL mutations for add, remove and toggle emoji62826-graphql-emoji-mutationsLuke Duncalfe2019-06-281-0/+4
* | | | Merge branch 'remove_group_and_instance_clusters_feature_flag' into 'master'Stan Hu2019-06-274-23/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Remove instance_clusters feature_flagremove_group_and_instance_clusters_feature_flagThong Kuah2019-06-282-11/+1
| * | | Remove group_clusters feature flagThong Kuah2019-06-283-12/+1
| | |/ | |/|
* | | Merge branch 'sh-handle-nil-replication-lag' into 'master'Andreas Brandl2019-06-271-1/+1
|\ \ \ | |/ / |/| |
| * | Fix background migrations failing with unused replication slotsh-handle-nil-replication-lagStan Hu2019-06-251-1/+1
* | | Merge branch '53811-issue-boards-to-core-projects-backend-ce' into 'master'Stan Hu2019-06-271-2/+1
|\ \ \
| * | | Move Multiple Issue Boards for Projects to Core53811-issue-boards-to-core-projects-backend-ceAlexandru Croitor2019-06-261-2/+1
* | | | Merge branch '61156-instance-level-cluster-pod-terminal-access' into 'master'Thong Kuah2019-06-272-36/+32
|\ \ \ \
| * | | | Move terminal construction logic to Environment61156-instance-level-cluster-pod-terminal-accessTiger2019-06-252-36/+32
* | | | | Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'Stan Hu2019-06-262-30/+4
|\ \ \ \ \
| * | | | | refactor: remove Sentry from application settingsRoger Meier2019-06-252-30/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch '62214-migrations-and-models' into 'master'Andreas Brandl2019-06-263-0/+19
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add two new ActiveRecord models62214-migrations-and-modelsMayra Cabrera2019-06-253-0/+19
| | |_|/ | |/| |
* | | | Set 2 weeks as the expiration time for the current broadcast messageDouglas Barbosa Alexandre2019-06-251-1/+1
| |/ / |/| |
* | | Merge branch 'require-pipeline-when-enabling-only-allow-merge-if-pipeline-suc...Grzegorz Bizon2019-06-251-2/+2
|\ \ \ | |/ / |/| |
| * | Use actual_head_pipeline to enforce presenceFabio Pitino2019-06-251-2/+2
| * | Require pipeline if "Pipeline must succeed" is setrequire-pipeline-when-enabling-only-allow-merge-if-pipeline-succeedsFabio Pitino2019-06-251-1/+1
* | | Merge branch 'update-gitlab-runner-helm-chart-to-0-6-0' into 'master'Kamil Trzciński2019-06-251-1/+1
|\ \ \ | |/ / |/| |
| * | Update GitLab Runner Helm Chart to 0.6.0update-gitlab-runner-helm-chart-to-0-6-0Tomasz Maczukin2019-06-241-1/+1
* | | Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-trackingHeinrich Lee Yu2019-06-251-1/+1
* | | Limit time tracking values to hoursJon Kolb2019-06-251-0/+1
| |/ |/|
* | Merge branch 'refactor_deployment_cluster' into 'master'Stan Hu2019-06-241-6/+3
|\ \
| * | Rename method to not clash with #clusterrefactor_deployment_clusterThong Kuah2019-06-241-1/+2
| * | Move innards of cluster method to environmentThong Kuah2019-06-241-5/+1
* | | Renew Let's Encrypt certificatesVladimir Shushlin2019-06-241-0/+10
* | | Rename Todos.with_api_entity_associations to with_entity_associationssh-optimize-todos-controllerStan Hu2019-06-241-1/+1
| |/ |/|
* | Merge branch 'fix-labels-in-hooks' into 'master'Ash McKenzie2019-06-241-0/+4
|\ \
| * | Added labels_hook_attrs methodfix-labels-in-hooksJan Provaznik2019-06-241-0/+4
* | | Merge branch 'fix-pipeline-schedule-edge-case' into 'master'Lin Jen-Shin2019-06-241-6/+17
|\ \ \
| * | | Fix pipeline schedule edge casefix-pipeline-schedule-edge-caseShinya Maeda2019-06-241-6/+17
* | | | Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-241-21/+15
|\ \ \ \
| * | | | Avoid touching the MR status if MR is not openedOswaldo Ferreira2019-06-211-4/+0
| * | | | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-06-201-21/+19
* | | | | Merge branch '17690-Protect-TeamCity-builds-for-triggering-when-a-branch-is-d...Thong Kuah2019-06-243-43/+94
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Extract common validations from ci servicesRaphael Tweitmann2019-06-213-48/+57
| * | | | Skip TeamCity on branch delete and add MR triggerNikolay Novikov2019-06-211-24/+66
| | |_|/ | |/| |
* | | | Merge branch '60617-enable-project-cluster-jit' into 'master'Thong Kuah2019-06-241-9/+0
|\ \ \ \
| * | | | Enable project-level JIT resource creation60617-enable-project-cluster-jitTiger2019-06-181-9/+0