summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-bump-shoulda-matcher' into 'master'Jan Provaznik2019-05-221-0/+2
|\
| * Fix remaining failures in shoulda-matcherStan Hu2019-05-211-0/+2
* | Merge branch '61935-remove-code-left-over-from-when-clusters-were-always-proj...Nick Thomas2019-05-224-61/+39
|\ \ | |/ |/|
| * Remove legacy Kubernetes #actual_namespace61935-remove-code-left-over-from-when-clusters-were-always-project-specificTiger2019-05-214-61/+39
* | Merge branch 'update-gitlab-runner-helm-chart-to-0-5-0' into 'master'Nick Thomas2019-05-211-1/+1
|\ \
| * | Update GitLab Runner Helm Chart to 0.5.0update-gitlab-runner-helm-chart-to-0-5-0Steve Azzopardi2019-05-201-1/+1
| |/
* | Bump devise to 4.6Utkarsh Gupta2019-05-211-9/+0
|/
* Merge branch 'environment_terminal_methods' into 'master'Stan Hu2019-05-201-2/+2
|\
| * Use Environment#deployment_platform method insteadenvironment_terminal_methodsThong Kuah2019-05-201-2/+2
* | Added filtering jobs by age to jobs/request API endpointDmitry Chepurovskiy2019-05-201-0/+2
* | Fix typos in the whole gitlab-ce projectYoginth2019-05-201-1/+1
|/
* Merge branch '60379-remove-ci-preparing-state-feature-flag' into 'master'James Lopez2019-05-171-2/+0
|\
| * Stop configuring group clusters on creation60379-remove-ci-preparing-state-feature-flagTiger2019-05-161-2/+0
* | Make ApplicationData a plain module include60550-make-application-data-plain-moduleDylan Griffith2019-05-161-39/+35
|/
* Merge branch 'jc-omit-count-diverging-commits-max' into 'master'Lin Jen-Shin2019-05-161-1/+22
|\
| * Omit max-count for diverging_commit_counts behind feature flagjc-omit-count-diverging-commits-maxJohn Cai2019-05-141-1/+22
* | Properly clear the merge error upon rebase failuresh-fix-rebase-error-clearingStan Hu2019-05-151-2/+2
* | Merge branch 'jej/list-sessions-for-user' into 'master'Stan Hu2019-05-161-11/+38
|\ \
| * | Sessions can be listed for a given userjej/list-sessions-for-userJames Edwards-Jones2019-05-151-11/+38
* | | Merge branch 'make-autocomplete-faster-with-lots-of-results' into 'master'53811-move-multiple-issue-boards-for-projects-to-coreStan Hu2019-05-141-0/+4
|\ \ \
| * | | Optimise upload path callsSean McGivern2019-05-141-0/+4
* | | | Merge branch 'fix-project-visibility-level-validation' into 'master'Stan Hu2019-05-141-2/+6
|\ \ \ \
| * | | | Fix project visibility level validationPeter Marko2019-05-141-2/+6
* | | | | Merge branch '55583-rename-method-conflicts' into 'master'Jan Provaznik2019-05-144-30/+30
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename methods that conflict in Rails 5.255583-rename-method-conflictsHeinrich Lee Yu2019-05-124-30/+30
| |/ / /
* | | | Merge branch '61302-remove-ignore_column-ci_cd' into 'master'Douglas Barbosa Alexandre2019-05-131-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove ignore_column from Project model61302-remove-ignore_column-ci_cdDmitriy Zaporozhets2019-05-101-1/+0
| |/ /
* | | Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass"Patrick Derichs2019-05-101-0/+1
|/ /
* | Change DetectRepositoryLanguagesWorker to not receive userDiego Silva2019-05-091-1/+1
* | Added user time settings fields to profileEzekiel Kigbo2019-05-072-0/+7
* | Merge branch 'mc/feature/pipeline-tracking-ce' into 'master'Grzegorz Bizon2019-05-071-0/+4
|\ \
| * | Backport EE changesmc/feature/pipeline-tracking-ceMatija Čupić2019-05-061-0/+4
| |/
* | Merge branch 'show-disabled-mirrors' into 'master'Nick Thomas2019-05-071-0/+4
|\ \
| * | Show disabled project repo mirrorsshow-disabled-mirrorsLuke Bennett2019-05-071-0/+4
* | | Add improvements to the global search processFrancisco Javier López2019-05-072-14/+22
* | | Merge branch 'strip-attr-cron-in-pipeline-schedule' into 'master'Grzegorz Bizon2019-05-071-0/+3
|\ \ \
| * | | Strip whitespace for PipelineSchedule#cronstrip-attr-cron-in-pipeline-scheduleFabio Pitino2019-05-021-0/+3
* | | | Merge branch 'instance_level_clusters' into 'master'Bob Van Landuyt2019-05-074-3/+41
|\ \ \ \
| * | | | Convert instance level clusters enabled to class methodJames Fargher2019-05-072-6/+2
| * | | | Change specs to match gitlab code standardsJames Fargher2019-05-071-9/+11
| * | | | Allow projects to use instance level clustersJames Fargher2019-05-073-1/+24
| * | | | Instance level kubernetes clusters adminJames Fargher2019-05-073-2/+19
| | |_|/ | |/| |
* | | | Merge branch '56992-add-filtering-to-project-dashboard-fe' into 'master'Kushal Pandya2019-05-071-2/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Added blank lines to meet style guideEzekiel Kigbo2019-05-061-2/+2
| * | | Added sorted_by_stars_asc scope to projects modelEzekiel Kigbo2019-05-061-0/+3
| | |/ | |/|
* | | Show health graphs on group-levelPeter Leitzen2019-05-061-3/+3
|/ /
* | Implement support for CI variables of type fileKrasimir Angelov2019-05-061-1/+6
* | Merge branch '30093-apply-bfg-object-map-to-database' into 'master'Douwe Maan2019-05-062-0/+8
|\ \
| * | Remove cleaned up OIDs from database and cacheNick Thomas2019-05-062-0/+8
* | | Fix merge request pipeline exist methodfix-merge-request-pipeline-exist-methodShinya Maeda2019-05-061-7/+3
|/ /