summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/encoding-to-unsupported-encodings' into 'master'Robert Speicher2018-02-091-0/+5
|\
| * Return a warning string if we try to encode to unsupported encodingAhmad Sherif2018-02-091-0/+5
* | Merge branch 'winh-remove-confirmation_input' into 'master'Clement Ho2018-02-091-63/+0
|\ \
| * | Remove confirmation_inputWinnie Hellmann2018-02-091-63/+0
| |/
* | Resolve failures in GitHub-ish import controller specsrs-pick-securityRobert Speicher2018-02-091-4/+4
* | Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'Kamil Trzciński2018-02-093-8/+16
* | Merge branch 'fix/gh-namespace-issue' into 'security-10-4'James Lopez2018-02-093-9/+68
* | Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'sec...Robert Speicher2018-02-092-0/+12
* | Merge branch 'fix-mermaid-xss' into 'security-10-4'Douwe Maan2018-02-096-3/+100
* | Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibil...Douwe Maan2018-02-096-53/+343
|/
* Merge branch 'fl-mr-widget-missing-branch' into 'master'Phil Hughes2018-02-091-25/+9
|\
| * Moves missing branch into a vue filefl-mr-widget-missing-branchFilipa Lacerda2018-02-081-25/+9
* | Replace $.post in importer status with axiosClement Ho2018-02-094-87/+228
|/
* Merge branch '40744-hashed-storage-specs' into 'master'Sean McGivern2018-02-0835-253/+348
|\
| * Use hashed storage in the specs40744-hashed-storage-specsNick Thomas2018-02-0735-253/+348
* | Make resetting column information overridable in EESean McGivern2018-02-081-2/+7
* | Added 'clear' button to ci lint editorLin Jen-Shin2018-02-081-8/+26
* | Merge branch 'feature/oidc-groups-claim' into 'master'Douwe Maan2018-02-082-5/+44
|\ \
| * | Add groups to OpenID Connect claimsHassan Zamani2018-02-082-5/+44
* | | Refactored merge_requests/show path in dispatcher.jsConstance Okoghenun2018-02-081-14/+6
* | | Merge branch '40994-expose-features-as-ci-cd-variable' into 'master'Kamil Trzciński2018-02-081-0/+1
|\ \ \
| * | | Expose GITLAB_FEATURES as CI/CD variable (fixes #40994)40994-expose-features-as-ci-cd-variableDylan Griffith2018-02-071-0/+1
* | | | Resolve "New design for user deletion confirmation in admin area"Shah El-Rahman2018-02-081-4/+4
* | | | Merge branch '41297-new-design-for-cancel-stop-pipeline-confirmation' into 'm...Clement Ho2018-02-083-12/+15
|\ \ \ \
| * | | | Add modal for stopping and retrying pipelines41297-new-design-for-cancel-stop-pipeline-confirmationShah El-Rahman2018-02-073-12/+15
* | | | | Migrate Git::Blob.batch to GitalyAhmad Sherif2018-02-082-42/+88
* | | | | 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
| |\ \ \ \ \ \ \ \ \ \