summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branchPawel Chojnacki2017-06-2238-459/+525
|\
| * Merge branch '34008-fix-CI_ENVIRONMENT_URL-2' into 'master'Kamil Trzciński2017-06-211-37/+11
| |\
| | * Move expanded_environment_url to CreateDeploymentServiceLin Jen-Shin2017-06-211-36/+0
| | * Don't expand CI_ENVIRONMENT_URL so runner would doLin Jen-Shin2017-06-211-3/+13
| * | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-2132-367/+367
| |/
| * Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-202-0/+44
| |\
| | * Refactor GroupProjectsFinder#init_collectionYorick Peterse2017-06-191-0/+32
| | * Refactor Project.with_feature_available_for_userYorick Peterse2017-06-161-0/+12
| * | Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-202-13/+13
| |\ \
| | * | Remove backticks from chat messages because they're not rendered as codedm-chat-message-backticksDouwe Maan2017-06-192-13/+13
| * | | Merge branch '30725-reset-user-limits-when-unchecking-external-user' into 'ma...Douwe Maan2017-06-191-0/+34
| |\ \ \ | | |/ / | |/| |
| | * | refactors user model validations30725-reset-user-limits-when-unchecking-external-userTiago Botelho2017-06-191-0/+2
| | * | Ensures default user limits when external user is uncheckedTiago Botelho2017-06-161-0/+32
| * | | Add table for files in merge request diffsSean McGivern2017-06-162-1/+13
| * | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-161-12/+12
| |\ \ \
| | * | | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-151-12/+12
| * | | | Improve method names and add more specsFelipe Artur2017-06-162-10/+5
| * | | | Remove old specs and add new onesFelipe Artur2017-06-163-29/+36
| | |_|/ | |/| |
* | | | move additional_metrics.yaml into prometheus/ config folderPawel Chojnacki2017-06-161-1/+1
* | | | Move Prometheus service to project modelPawel Chojnacki2017-06-161-3/+4
* | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-1655-208/+825
|\ \ \ \ | |/ / /
| * | | Deserialise existing custom notification settingsdeserialize-custom-notificationsSean McGivern2017-06-151-0/+30
| * | | #13336 - display multiple messages in both the UI and git outputMike Ricketts2017-06-151-6/+13
| * | | Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-153-3/+19
| |\ \ \ | | |/ / | |/| |
| | * | Do not show manual actions that cannot be runfix-manual-actionsKamil Trzcinski2017-06-133-3/+19
| * | | Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-1442-124/+388
| | |/ | |/|
| * | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-142-0/+186
| |\ \
| | * | Implement diff viewersDouwe Maan2017-06-142-0/+186
| * | | Backport EE changes to the Kubernetes serviceNick Thomas2017-06-141-26/+46
| |/ /
| * | Handle legacy jobs without namezj-commit-status-sortable-nameZ.J. van de Weg2017-06-131-0/+11
| |/
| * Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-121-1/+1
| |\
| | * Fix linting, route, and specsRémy Coutable2017-06-091-1/+1
| | * Fix spec failures and add a feature flag for the performance barRémy Coutable2017-06-091-1/+1
| * | Use :request_store hooks on specsuse-request-store-helper-instead-actual-codeOswaldo Ferreira2017-06-092-20/+2
| |/
| * Merge branch 'dm-blob-binaryness-change' into 'master'Sean McGivern2017-06-091-2/+2
| |\
| | * Detect if file that appears to be text in the first 1024 bytes is actually bi...dm-blob-binaryness-changeDouwe Maan2017-06-081-2/+2
| * | Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-084-5/+11
| |\ \ | | |/ | |/|
| | * Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-084-5/+11
| | |\
| | | * Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-074-5/+11
| * | | Add Blob#file_type convenience methoddm-blob-file-typeDouwe Maan2017-06-081-0/+8
| |/ /
| * | Merge branch '12614-fix-long-message' into 'master'Dmitriy Zaporozhets2017-06-081-2/+24
| |\ \ | | |/ | |/|
| | * Fix long urls in the title of commitAlexander Randa2017-05-121-2/+24
| * | nil-check Repository::is_ancestor?Kim Carlbäcker2017-06-081-8/+32
| * | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-072-9/+34
| |\ \
| | * \ Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-064-44/+38
| | |\ \
| | * | | Improve specs for pipeline and pipeline seedsGrzegorz Bizon2017-06-051-2/+2
| | * | | Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-0528-563/+925
| | |\ \ \
| | * | | | Refine implementation of pipeline stage seedsGrzegorz Bizon2017-06-021-7/+7
| | * | | | Rename `Ci::Stage` class to `Ci::LegacyStage`Grzegorz Bizon2017-06-012-2/+2
| | * | | | Rename pipeline methods related to legacy stagesGrzegorz Bizon2017-06-011-7/+7