summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '42462-edit-note' into 'master'Fatih Acet2018-02-072-47/+66
|\
| * Resolve "Cancelling a second comment edit doesn't return its state to before ...Simon Knox2018-02-072-47/+66
* | Replace $.ajax in profile.js with axiosClement Ho2018-02-071-0/+9
|/
* Merge branch 'fix/cache-gitaly-find-commits' into 'master'Sean McGivern2018-02-071-0/+26
|\
| * Cache Gitaly FindCommit RPC responsefix/cache-gitaly-find-commitsAhmad Sherif2018-02-071-0/+26
* | Merge branch 'fix_help_controller_spec' into 'master'Sean McGivern2018-02-071-1/+1
|\ \
| * | Updating `HelpController` spec to use an existing imageMario de la Ossa2018-02-071-1/+1
* | | Merge branch '4656-ce-port-filtered-search-bar' into 'master'Clement Ho2018-02-076-32/+36
|\ \ \ | |/ / |/| |
| * | Import FilteredSearchTokenKeys, update class initialization syntax4656-ce-port-filtered-search-barKushal Pandya2018-02-071-5/+6
| * | Import and use `FilteredSearchTokenKeys` independentlyKushal Pandya2018-02-075-27/+30
* | | Merge branch 'ce-4813-fix-ee-projects-destroy_service_spec' into 'master'Sean McGivern2018-02-074-19/+15
|\ \ \
| * | | Reset column information after the schema is migrated in MigrationsHelpers.sc...ce-4813-fix-ee-projects-destroy_service_specRémy Coutable2018-02-074-19/+15
* | | | Merge branch 'clear-job-request-timeout' into 'master'Filipa Lacerda2018-02-071-18/+27
|\ \ \ \
| * | | | Clear the timeout in Jobs class after each testPhil Hughes2018-02-071-18/+27
* | | | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-0710-49/+332
|\ \ \ \ \
| * | | | | Catch json parsing error as PrometheusErrorpawel/connect_to_prometheus_through_proxy-30480Pawel Chojnacki2018-02-071-0/+10
| * | | | | Fix order of checks in editable? method.Pawel Chojnacki2018-02-072-3/+3
| * | | | | Make prometheus service querying approach much nicer wrt to arity and default...Pawel Chojnacki2018-02-072-0/+25
| * | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-06208-1797/+6435
| |\ \ \ \ \
| * | | | | | fix tests for find or initialize service 'prometheus'Pawel Chojnacki2018-02-061-1/+1
| * | | | | | fix broken karma specs due to removed functionMike Greiling2018-01-312-28/+2
| * | | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-3146-529/+1088
| |\ \ \ \ \ \
| * | | | | | | enable manual configuration property for all test prometheus servicesPawel Chojnacki2018-01-301-1/+2
| * | | | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-29281-3031/+5109
| |\ \ \ \ \ \ \
| * | | | | | | | add manual_configuration to prometheus_service factory to enable it by defaultPawel Chojnacki2018-01-171-0/+1
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-17307-2037/+8200
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix rubocop warningsPawel Chojnacki2018-01-043-10/+13
| * | | | | | | | | Test Prometheus proxy client generationPawel Chojnacki2018-01-041-0/+51
| * | | | | | | | | add tests for Manual configuration override and service activation synchroniz...Pawel Chojnacki2018-01-041-0/+66
| * | | | | | | | | Cleanup PrometheusService testsPawel Chojnacki2018-01-041-33/+38
| * | | | | | | | | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-041-0/+127
| * | | | | | | | | Fix prometheus client testsPawel Chojnacki2018-01-041-6/+8
| * | | | | | | | | Add test checking if prometheus integration is enabled after prometheus is in...Pawel Chojnacki2018-01-043-2/+20
* | | | | | | | | | Merge branch '3559-ce-port-group-roadmap' into 'master'Filipa Lacerda2018-02-073-0/+99
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add `convertObjectPropsToCamelCase` helper methodKushal Pandya2018-02-071-0/+29
| * | | | | | | | | | Add `convertToCamelCase` helper methodKushal Pandya2018-02-071-0/+6
| * | | | | | | | | | Update tests for date helper functionsKushal Pandya2018-02-071-0/+64
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Removing gitaly flagsFrancisco Javier López2018-02-074-364/+404
* | | | | | | | | | Merge branch 'zj-refs-hash' into 'master'Sean McGivern2018-02-072-5/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't use rugged in Repository#refs_hashZeger-Jan van de Weg2018-02-072-5/+9
* | | | | | | | | | | Merge branch 'rd-35856-backport-lfs-file-locking-api' into 'master'Sean McGivern2018-02-0713-1/+582
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-0713-1/+582
* | | | | | | | | | | | Merge branch '41763-search-api' into 'master'Sean McGivern2018-02-0711-95/+553
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | port ee changesJarka Kadlecová2018-02-072-93/+98
| * | | | | | | | | | | Return only limited pagination headers for search API endpointsJarka Kadlecová2018-02-062-1/+7
| * | | | | | | | | | | Support search in APIJarka Kadlecová2018-02-069-3/+450
* | | | | | | | | | | | Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master'Kamil Trzciński2018-02-072-20/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update style of yaml_processor_spec.rbKamil Trzciński2018-02-071-2/+7
| * | | | | | | | | | | | Handle all YAML parser exceptions in .gitlab-ci.yml (fixes #41209)41209-ci-linter-fails-on-gitlab-ci-blob-viewerDylan Griffith2018-02-072-19/+27
* | | | | | | | | | | | | Merge branch 'fix/gb/fix-redundant-pipeline-stages' into 'master'Kamil Trzciński2018-02-073-16/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status