summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cache-user-keys-count' into 'master'Douwe Maan2017-11-162-1/+16
|\
| * Cache the number of user SSH keyscache-user-keys-countYorick Peterse2017-11-162-1/+16
* | Merge branch '40122-only-one-note-webhook-is-triggered-when-a-comment-with-ti...Douwe Maan2017-11-151-1/+5
|\ \
| * | Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-addedRémy Coutable2017-11-151-1/+5
* | | Fix dumping hashed storage based repositoryGabriel Mazetto2017-11-151-1/+1
|/ /
* | Merge branch 'dm-import-service-polymorphism' into 'master'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forksYorick Peterse2017-11-151-4/+0
|\ \ | |/ |/|
| * Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-151-4/+0
* | Resolve "Internationalization support for Prometheus Service Configuration"Jose Ivan Vargas Lopez2017-11-151-3/+3
* | Include child projects a user can manage in namespace dropdownsBob Van Landuyt2017-11-141-1/+10
* | Merge branch 'issue_40058' into 'master'Sean McGivern2017-11-141-1/+2
|\ \
| * | Prevents position update for image diff notesissue_40058Felipe Artur2017-11-131-1/+2
* | | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'Kamil Trzciński2017-11-141-0/+4
|\ \ \
| * \ \ Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-newShinya Maeda2017-11-0715-158/+298
| |\ \ \
| * | | | Add doc. Fix spec. Add erase_build in protected_ref ruleShinya Maeda2017-11-071-1/+1
| * | | | Do not allow jobs to be erasedShinya Maeda2017-11-061-0/+4
* | | | | Merge branch '39884-fix-pipeline-transition-with-single-manual-action' into '...Kamil Trzciński2017-11-141-2/+2
|\ \ \ \ \
| * | | | | Make sure all pipelines would go to pending once39884-fix-pipeline-transition-with-single-manual-actionLin Jen-Shin2017-11-091-2/+2
* | | | | | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-142-9/+13
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Handle forks in Gitlab::Checks::LfsIntegrityjej/fix-lfs-integrity-with-forksJames Edwards-Jones2017-11-092-9/+13
* | | | | | Add administrative endpoint to list all pages domainsTravis Miller2017-11-131-0/+4
| |_|_|_|/ |/| | | |
* | | | | Merge branch '39602-move-update-project-counter-caches-out-of-issues-merge-re...Rémy Coutable2017-11-132-8/+0
|\ \ \ \ \
| * | | | | Move update_project_counter_caches? out of issue and merge requestGeorge Andrinopoulos2017-11-112-8/+0
* | | | | | Add externalized stringsGeorge Andrinopoulos2017-11-111-1/+1
* | | | | | Move total time spend calculation to milestoneishGeorge Andrinopoulos2017-11-113-16/+8
* | | | | | Fix collapsed sidebar messages and iconGeorge Andrinopoulos2017-11-112-2/+2
* | | | | | Add total time spent to milestonesGeorge Andrinopoulos2017-11-112-0/+16
|/ / / / /
* | | | | Merge branch 'fix-502-mrs-with-lots-of-versions' into 'master'Yorick Peterse2017-11-101-1/+13
|\ \ \ \ \
| * | | | | Fix another timeout when searching for pipelinesSean McGivern2017-11-101-1/+13
* | | | | | Prepare Repository#fetch_source_branch for migrationJacob Vosmaer (GitLab)2017-11-101-0/+4
|/ / / / /
* | | | | Always return full avatar URL for private/internal groups/projects when asset...Douwe Maan2017-11-091-7/+18
| |/ / / |/| | |
* | | | Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-083-2/+6
|\ \ \ \
| * | | | Use Commit#notes and Note.for_commit_id when possible to make sure we use all...dm-notes-for-commit-idDouwe Maan2017-11-083-2/+6
* | | | | Rewrite the GitHub importer from scratchYorick Peterse2017-11-073-0/+50
* | | | | Refactor User.find_by_any_emailYorick Peterse2017-11-071-9/+9
* | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Kamil Trzcinski2017-11-075-6/+14
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-085-6/+14
| |\ \ \ \ \
| | * | | | | Refactor issuables index actionsJarka Kadlecova2017-11-073-4/+2
| | |/ / / /
| | * | | | Merge branch 'fix/gb/ensure-that-job-belongs-to-stage' into 'master'Kamil Trzciński2017-11-071-1/+11
| | |\ \ \ \
| | | * | | | Extract ensure stage service from commit status classGrzegorz Bizon2017-11-061-27/+3
| | | * | | | Use existing pipeline stage if stage already existsGrzegorz Bizon2017-11-061-3/+11
| | | * | | | Make sure that every job has a stage assignedGrzegorz Bizon2017-11-061-1/+27
| | * | | | | Merge branch '39649-change-default-size-for-gke-cluster-creation' into 'master'Kamil Trzciński2017-11-071-1/+1
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Change new occurrencies of n1-default-439649-change-default-size-for-gke-cluster-creationbikebilly2017-11-071-1/+1
* | | | | | | Make ingress to use install_commandKamil Trzcinski2017-11-071-0/+4
* | | | | | | Merge remote-tracking branch 'origin/38464-k8s-apps' into add-ingress-to-clus...Kamil Trzcinski2017-11-071-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add Helm InstallCommandAlessio Caiazza2017-11-071-0/+4
* | | | | | | Fix ingress.rbKamil Trzcinski2017-11-071-0/+2
* | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-078-7/+23
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix tests for initial statusKamil Trzcinski2017-11-071-0/+2
| * | | | | | Fix initial status againKamil Trzcinski2017-11-072-7/+5