summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backstage/gb/populating-pipeline-refactoring' into 'master'Kamil Trzciński2018-03-261-6/+20
|\
| * Remove outdates TODOs from pipeline classGrzegorz Bizon2018-03-231-4/+0
| * Bring seeds size method back to CI/CD pipeline classGrzegorz Bizon2018-03-221-0/+4
| * Fix static analysis and tests related to YAML processingGrzegorz Bizon2018-03-221-1/+1
| * Decouple YAML processor from pipeline objectsGrzegorz Bizon2018-03-221-1/+7
| * Make it easier to test pipeline stage seedsGrzegorz Bizon2018-03-211-0/+3
| * Reduce stage seeds coupling between pipeline and YAMLGrzegorz Bizon2018-03-211-8/+0
| * Support building all pipeline resource before savingGrzegorz Bizon2018-03-211-6/+2
| * Introduce pipeline build seedsGrzegorz Bizon2018-03-211-0/+17
* | Merge branch '43552-user-owned-projects-query-performance-improvement' into '...Douwe Maan2018-03-261-3/+10
|\ \
| * | Improves User#owned_projects query performanceTiago Botelho2018-03-261-3/+10
* | | Merge branch 'YarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-t...Grzegorz Bizon2018-03-263-5/+19
|\ \ \
| * | | Send notification emails when push to a merge requestYarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-requestYarNayar2018-03-263-5/+19
* | | | Merge branch '43316-controller-parameters-handling-sensitive-information-shou...Kamil Trzciński2018-03-263-0/+6
|\ \ \ \
| * | | | Make Variable key not secret43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-nameMatija Čupić2018-03-223-3/+0
| * | | | Use secret_key and secret_value in Pipeline Schedule variablesMatija Čupić2018-03-171-0/+3
| * | | | Alias secret_key and secret_value to key and valueMatija Čupić2018-03-172-0/+6
* | | | | Merge branch 'ab-43150-users-controller-show-query-limit' into 'master'Yorick Peterse2018-03-261-5/+5
|\ \ \ \ \
| * | | | | Remove N+1 query for Noteable association.ab-43150-users-controller-show-query-limitAndreas Brandl2018-03-231-5/+5
* | | | | | Merge branch 'pages_force_https' into 'master'Nick Thomas2018-03-232-2/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add HTTPS-only pagesRob Watson2018-03-222-2/+29
* | | | | | Merge branch '43771-improve-avatar-error-message' into 'master'Sean McGivern2018-03-232-7/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Change avatar error message to include allowed file formatsFabian Schneider2018-03-222-7/+1
* | | | | | Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern2018-03-231-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-211-1/+1
* | | | | | Merge branch 'master' into 'latest-security-to-master-21-03-18'James Lopez2018-03-223-4/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '37987-speed-up-pipeline-creation' into 'master'Kamil Trzciński2018-03-221-1/+1
| |\ \ \ \ \ \
| | * | | | | | Add inverse_of: :pipeline for pipeline.builds (#37987)37987-speed-up-pipeline-creationDylan Griffith2018-03-211-1/+1
| * | | | | | | Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_reque...ee-5063-to-ce-backportTiago Botelho2018-03-212-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-2114-37/+29
|/ / / / / /
* | | | | | Merge branch 'fix-ci-job-auto-retry' into 'master'Grzegorz Bizon2018-03-201-1/+5
|\ \ \ \ \ \
| * | | | | | Prevent auto-retry AccessDenied error from stopping transition to failedTomasz Maczukin2018-03-201-1/+5
* | | | | | | Merge branch 'fix/sm/erase_old_trace' into 'master'Kamil Trzciński2018-03-201-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Use update_column than write_attribute and savefix/sm/erase_old_traceShinya Maeda2018-03-191-2/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'issue_25542' into 'master'Sean McGivern2018-03-202-3/+34
|\ \ \ \ \ \ \
| * | | | | | | Improve JIRA event descriptionsissue_25542Felipe Artur2018-03-192-3/+34
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '43933-always-notify-mentions' into 'master'Sean McGivern2018-03-191-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Always notify new mentions even if explicitly unsubscribed43933-always-notify-mentionsMario de la Ossa2018-03-191-1/+2
* | | | | | | | Merge branch '31114-internal-ids-are-not-atomic' into 'master'Sean McGivern2018-03-198-5/+180
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Replace public_send calls.Andreas Brandl2018-03-181-3/+3
| * | | | | | | Address review comments.Andreas Brandl2018-03-162-9/+10
| * | | | | | | Only support single scope argument.Andreas Brandl2018-03-161-4/+2
| * | | | | | | Address review comments.Andreas Brandl2018-03-162-17/+15
| * | | | | | | Add shared specs for AtomicInternalId concern.Andreas Brandl2018-03-161-1/+1
| * | | | | | | Backwards-compat for migration specs.Andreas Brandl2018-03-161-2/+18
| * | | | | | | Refactor, extract class and improve comments.Andreas Brandl2018-03-163-37/+90
| * | | | | | | More flexible way of internal id generation.Andreas Brandl2018-03-163-29/+33
| * | | | | | | Atomic generation of internal ids for issues.Andreas Brandl2018-03-164-1/+106
| * | | | | | | Deprecate InternalId concern and rename.Andreas Brandl2018-03-165-5/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'update-kubeclient' into 'master'Grzegorz Bizon2018-03-192-2/+2
|\ \ \ \ \ \ \