summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'allow_numeric_values_in_gitlab_ci_yml' into 'master' Kamil Trzciński2017-05-152-2/+10
|\ | | | | | | | | | | | | Allow numeric values in gitlab-ci.yml Closes #30017 See merge request !10607
| * Allow numeric values in gitlab-ci.ymlblackst0ne2017-05-072-2/+10
| |
* | Merge branch 'rename-column-concurrently-defaults' into 'master' Rémy Coutable2017-05-151-2/+6
|\ \ | | | | | | | | | | | | Fix adding defaults for concurrent column renames See merge request !11335
| * | Fix adding defaults for concurrent column renamesrename-column-concurrently-defaultsYorick Peterse2017-05-121-2/+6
| | | | | | | | | | | | | | | | | | By adding the default value _after_ adding the column we avoid updating all rows in a table, saving a lot of time and unnecessary work in the process.
* | | Merge branch 'dturner/username' into 'master' Rémy Coutable2017-05-151-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add username field to push webhook Closes #32136 See merge request !11272
| * | | Add username field to push webhookDavid Turner2017-05-101-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: David Turner <novalis@novalis.org>
* | | | Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master' Robert Speicher2017-05-141-9/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch commit deltas from Gitaly Closes gitaly#199 See merge request !11122
| * | | | Add support for deltas_only under GitalyAhmad Sherif2017-05-131-9/+41
| | | | | | | | | | | | | | | | | | | | Closes gitaly#199
* | | | | Added repository_update hookGabriel Mazetto2017-05-121-0/+1
| | | | |
* | | | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
| * | | | | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.
* | | | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-121-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage ping updates Closes #31741 and #31453 See merge request !11231
| * | | | | Add hostname to usage pingSean McGivern2017-05-111-0/+1
| |/ / / /
* | | | | Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-128-11/+163
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Autolink package names in Gemfile See merge request !11224
| * | | | | Remove unrelated link from specDouwe Maan2017-05-121-7/+0
| | | | | |
| * | | | | Link Gemfile git URLsDouwe Maan2017-05-121-1/+5
| | | | | |
| * | | | | Fix specsDouwe Maan2017-05-101-2/+2
| | | | | |
| * | | | | Autolink package names in GemfileDouwe Maan2017-05-103-0/+87
| | | | | |
| * | | | | Add Gitlab::StringRegexMarkerDouwe Maan2017-05-102-2/+20
| | | | | |
| * | | | | Extract generic parts of Gitlab::Diff::InlineDiffMarkerDouwe Maan2017-05-103-9/+59
| | | | | |
* | | | | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-122-1/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
| * | | | | | match query times with appropriate deltaPawel Chojnacki2017-05-111-8/+9
| | | | | | |
| * | | | | | Keep presentation logic in one place and remove unecessary arguments.Pawel Chojnacki2017-05-111-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + fix tests
| * | | | | | Custom queries for prometheusPawel Chojnacki2017-05-112-1/+32
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tests for prometheus queries - fix rubocop warnings - Remove unused method. Add more queries to deployment queries. - Wrap BaseQuery in module hierarchy Renname Prometheus class to PrometheusClient
* | | | | | Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan2017-05-121-0/+31
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Only rename namespaces and projects with an invalid path See merge request !11338
| * | | | | Only rename namespaces and projects with an invalid pathBob Van Landuyt2017-05-121-0/+31
| |/ / / / | | | | | | | | | | | | | | | For exact matches, not namespaces that end with an invalid path
* | | | | Merge branch 'backport_file_filder_from_ee' into 'master' Sean McGivern2017-05-122-1/+22
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Backport FileFinder from EE Closes #32188 See merge request !11319
| * | | | Backport FileFinder from EEbackport_file_filder_from_eeValery Sizov2017-05-122-1/+22
| | | | |
* | | | | Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot2017-05-101-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retried in database Closes #25737 See merge request !11115
| * | | | | Store retried in database for CI buildsretried-in-database-mysqlKamil Trzcinski2017-05-071-0/+1
| | | | | |
* | | | | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵Robert Speicher2017-05-1014-34/+34
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
| * | | | | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-106-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-109-24/+24
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-101-3/+72
| | | | | | | | | | | | | | | | | | | | | | | | | Respect project features in wiki and blob search See merge request !2089
* | | | | Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'Robert Speicher2017-05-102-38/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (security-9-1) Add correct `rel` attributes to external links when rendering markdown See merge request !2097
* | | | | Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-102-4/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | (security-9-1) Render asciidoc & other markup using banzai in a pipeline See merge request !2098
* | | | Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-093-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preloads head pipeline for each merge request Closes #27168 See merge request !10064
| * | | | Small code improvements and add migration specFelipe Artur2017-05-081-0/+1
| | | | |
| * | | | Fix specs 2Felipe Artur2017-05-081-2/+2
| | | | |
| * | | | Fix SpecsFelipe Artur2017-05-082-0/+5
| | | | |
| * | | | Preloads head pipeline for each merge requestFelipe Artur2017-05-081-0/+1
| | | | |
* | | | | Merge request widget redesignFatih Acet2017-05-091-1/+19
|/ / / /
* | | | Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' ↵31977-ensure-all-webpack-bundles-which-include-vue-are-children-of-common_vue-jsDmitriy Zaporozhets2017-05-081-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Use regex to skip unnecessary reference processing in ProcessCommitWorker Closes #28359 See merge request !10867
| * | | | Cycle analytics specs needed Commit to reference issue28359-skip-process-commit-worker-unless-issues-referencedJames Edwards-Jones2017-05-041-3/+1
| | |_|/ | |/| | | | | | The plan stage both measures time taken and lists related commits. We test for commits being listed, so needed to actually mention the issue in them. An alternative would have been adding “allow_any_instance_of(Commit).to receive(:matches_cross_reference_regex?).and_return(true)” but this felt too coupled to implementation.
* | | | Add confirm delete protected branch modalSam Rose2017-05-083-28/+109
| | | |
* | | | Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher2017-05-071-8/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for commit diff ignore_whitespace_change and paths flags Closes gitaly#198 See merge request !11028
| * | | | Remove stubbing from Gitlab::GitalyClient::Commit specsAhmad Sherif2017-05-071-8/+3
| | |/ / | |/| | | | | | | | | | Closes gitaly#198
* | | | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-073-11/+19
|/ / /
* | | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ↵Kamil Trzciński2017-05-066-51/+137
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Check access to a branch when user triggers manual action Closes #20261 See merge request !10494
| * | | Add specs for extended status for manual actionsGrzegorz Bizon2017-05-051-0/+56
| | | |
View Lorry Controller Status