summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Native group milestonesFelipe Artur2017-07-078-11/+137
* Merge branch 'speed-up-merge-request-all-commits-shas' into 'master'Douwe Maan2017-07-071-1/+4
|\
| * Speed up `all_commit_shas` for new merge requestsSean McGivern2017-07-071-1/+4
* | Merge branch 'fix-sha-attribute-no-table' into 'master'Yorick Peterse2017-07-071-0/+2
|\ \
| * | Fix ShaAttribute concern when there is no tablefix-sha-attribute-no-tableSean McGivern2017-07-071-0/+2
| |/
* | Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'Kamil Trzciński2017-07-074-0/+24
|\ \ | |/ |/|
| * secret_variables_for: rails readability versinoShinya Maeda2017-07-071-11/+5
| * Add CASE When Clause for saving order when using where INShinya Maeda2017-07-071-1/+9
| * Use ancestors for avoiding N queriesShinya Maeda2017-07-071-4/+3
| * Basic BE changeShinya Maeda2017-07-074-0/+23
* | Merge branch 'dm-readme-auxiliary-blob-viewer-without-wiki' into 'master'Sean McGivern2017-07-072-0/+10
|\ \ | |/ |/|
| * Don't show auxiliary blob viewer for README when there is no wikidm-readme-auxiliary-blob-viewer-without-wikiDouwe Maan2017-07-062-0/+10
* | Add table for merge request commitsSean McGivern2017-07-065-72/+79
* | Merge branch 'backport_slack_application_changes' into 'master'Sean McGivern2017-07-061-0/+8
|\ \ | |/ |/|
| * Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_r...backport_slack_application_changesValery Sizov2017-07-051-0/+8
* | Merge branch '34716-environment-specific-variables-ce' into 'master'Douwe Maan2017-07-062-8/+16
|\ \
| * | Backports for ee-2112Lin Jen-Shin2017-07-062-8/+16
* | | Merge branch '33360-generate-kubeconfig' into 'master'Kamil Trzciński2017-07-061-1/+12
|\ \ \
| * | | Rename KUBECONFIG_FILE to KUBECONFIGLin Jen-Shin2017-07-061-1/+1
| * | | Merge remote-tracking branch 'upstream/master' into 33360-generate-kubeconfigLin Jen-Shin2017-07-0656-457/+660
| |\ \ \ | | |/ /
| * | | Changelog entry, doc, and only pass KUBECONFIG_FILELin Jen-Shin2017-06-161-2/+1
| * | | Generate KUBECONFIG in KubernetesService#predefined_variablesLin Jen-Shin2017-06-161-1/+13
* | | | Merge branch 'foreign-keys-for-project-model' into 'master'Sean McGivern2017-07-0639-164/+190
|\ \ \ \
| * | | | Rename ActiverecordSerialize copYorick Peterse2017-07-0615-27/+27
| * | | | Added Cop to blacklist the use of `dependent:`Yorick Peterse2017-07-0626-73/+80
| * | | | Add many foreign keys to the projects tableYorick Peterse2017-07-063-68/+87
| | |/ / | |/| |
* | | | Merge branch '34698-fix-stubbing-cached-markdown-fields' into 'master'Rémy Coutable2017-07-061-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix stubbing attributes alongside cache_markdown_fieldNick Thomas2017-07-051-1/+1
| | |/ | |/|
* | | Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'Grzegorz Bizon2017-07-063-6/+32
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-058-21/+72
| |\ \ \ | | |/ /
| * | | Rename ci_config_file to ci_config_pathLin Jen-Shin2017-07-052-5/+5
| * | | Add back Pipeline#ci_yaml_file_path due to all the troublesLin Jen-Shin2017-07-053-13/+13
| * | | Fix config pathLin Jen-Shin2017-07-041-1/+1
| * | | Also remove null characterLin Jen-Shin2017-07-041-1/+1
| * | | Follow feedback on the merge requestLin Jen-Shin2017-07-043-14/+14
| * | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-035-10/+8
| |\ \ \
| * | | | Introduce CI_CONFIG_PATHLin Jen-Shin2017-06-301-1/+2
| * | | | Update wordings, allow only full path, add testsLin Jen-Shin2017-06-302-12/+11
| * | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-06-3014-107/+132
| |\ \ \ \
| * | | | | Fix the test and implement missing updateLin Jen-Shin2017-06-281-0/+2
| * | | | | Inline what it was before for the regexp and messageLin Jen-Shin2017-06-281-2/+2
| * | | | | Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Confi...15041-Add-Custom-CI-Config-PathLin Jen-Shin2017-06-28268-4387/+10268
| |\ \ \ \ \
| * | | | | | Add config option to project to allow custom .gitlab-ci.yml locationKeith Pope2016-10-082-1/+22
* | | | | | | Merge branch '32408-allow-creation-of-files-and-dirs-with-spaces-in-web-ui' i...Douwe Maan2017-07-051-3/+1
|\ \ \ \ \ \ \
| * | | | | | | Removes file_name_regex from Gitlab::Regex32408-allow-creation-of-files-and-dirs-with-spaces-in-web-uiTiago Botelho2017-07-051-3/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-058-21/+15
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'revert-2c879643' into 'master'Sean McGivern2017-07-042-3/+26
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643Douwe Maan2017-07-042-3/+26
* | | | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master'Rémy Coutable2017-07-041-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | chaining the methods in ref_slugStefan Hanreich2017-06-241-3/+4
View Lorry Controller Status