summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-152-52/+25
* Merge branch 'dm-fix-parser-cache' into 'master'Sean McGivern2017-06-151-1/+1
* Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-081-0/+11
|\
| * Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-073-6/+196
* | Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney2017-06-082-6/+185
* | Merge branch 'dm-diff-file-diffable' into 'master'Sean McGivern2017-06-083-54/+27
|\ \
| * | Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-083-54/+27
| |/
* | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-081-24/+13
|/
* Merge branch 'krakowski_master2' into 'master'Grzegorz Bizon2017-06-071-28/+83
|\
| * Add source policy specShinya Maeda2017-06-081-0/+19
| * Fix typo in testFilip Krakowski2017-06-081-1/+1
| * Fix static-analysis offenses (again)Filip Krakowski2017-06-081-18/+18
| * Fix static-analysis offensesFilip Krakowski2017-06-081-6/+6
| * Add all sources as special keywords for only and exceptFilip Krakowski2017-06-081-71/+63
| * Use pipeline.source to determine what triggered a pipelineFilip Krakowski2017-06-081-4/+4
| * Add 'schedules' keyword to 'only' and 'except'Filip Krakowski2017-06-081-0/+44
* | Added more actions and report as abuse to all notesLuke "Jared" Bennett2017-06-071-0/+11
* | Merge branch 'fix/backup-restore-resume' into 'master'James Lopez2017-06-071-0/+63
|\ \
| * | refactor code and specJames Lopez2017-06-071-9/+4
| * | fix spec and added changelogJames Lopez2017-06-071-2/+2
| * | fix spec and added changelogJames Lopez2017-06-071-2/+0
| * | add more spec examplesJames Lopez2017-06-071-6/+41
| * | add repository specJames Lopez2017-06-071-0/+35
* | | Sync email address from specified omniauth providerRobin Bobbitt2017-06-072-9/+49
| |/ |/|
* | Merge branch 'dm-diff-file-straight-diff' into 'master'Sean McGivern2017-06-073-2/+111
|\ \
| * | Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diffDouwe Maan2017-06-063-2/+111
* | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-074-2/+116
|\ \ \
| * \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-069-99/+390
| |\ \ \
| * | | | Improve specs for pipeline and pipeline seedsGrzegorz Bizon2017-06-051-1/+1
| * | | | Fix typo in import/export safe model attributesGrzegorz Bizon2017-06-051-1/+1
| * | | | Add assertions about new pipeline stage in specsGrzegorz Bizon2017-06-051-0/+4
| * | | | Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-0550-520/+2181
| |\ \ \ \
| * | | | | Export pipeline stages in import/export featureGrzegorz Bizon2017-06-052-0/+14
| * | | | | Fix invalid conditional in pipeline create serviceGrzegorz Bizon2017-06-021-2/+1
| * | | | | Refine implementation of pipeline stage seedsGrzegorz Bizon2017-06-023-78/+72
| * | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-011-0/+1
| |\ \ \ \ \
| * | | | | | Return stage seeds object from YAML processorGrzegorz Bizon2017-05-312-16/+18
| * | | | | | Refine pipeline stages seeds classGrzegorz Bizon2017-05-312-47/+62
| * | | | | | Add stage seed class that represents attributesGrzegorz Bizon2017-05-301-0/+47
| * | | | | | Implement CI/CD config attributes for persisted stagesGrzegorz Bizon2017-05-301-1/+40
* | | | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into 'master'Kamil Trzciński2017-06-071-0/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge commit '6ac1caa01a4c059f5bcb7c9da2e83001e5469f73' into feature/gb/migra...feature/gb/migrate-pipeline-stagesGrzegorz Bizon2017-06-069-99/+390
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into feature/gb/migrate-pipeline-stagesGrzegorz Bizon2017-06-0550-519/+2180
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | |
| * | | | | Use stage_id column in code that needs to know about itGrzegorz Bizon2017-06-011-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-072-1/+185
|\ \ \ \ \
| * | | | | Do not cleanup temp directory as this apparently causes silent rspec failures...Pawel Chojnacki2017-06-071-7/+2
| * | | | | Make PrometheusTextFormat return proper output terminated with '\n'Pawel Chojnacki2017-06-021-2/+2
| * | | | | Make production settings fixture use Gitlab::CurrentSettings.current_applicat...Pawel Chojnacki2017-06-021-9/+5
| * | | | | Make fixture message more descriptivePawel Chojnacki2017-06-021-12/+13
| * | | | | Add prometheus text formatterPawel Chojnacki2017-06-021-0/+44