summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'allow_numeric_values_in_gitlab_ci_yml' into 'master' Kamil Trzciński2017-05-152-1/+11
|\
| * Allow numeric values in gitlab-ci.ymlblackst0ne2017-05-072-1/+11
* | Merge branch 'rename-column-concurrently-defaults' into 'master' Rémy Coutable2017-05-151-1/+5
|\ \
| * | Fix adding defaults for concurrent column renamesrename-column-concurrently-defaultsYorick Peterse2017-05-121-1/+5
* | | Merge branch 'dturner/username' into 'master' Rémy Coutable2017-05-151-0/+2
|\ \ \
| * | | Add username field to push webhookDavid Turner2017-05-101-0/+2
* | | | Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master' Robert Speicher2017-05-142-29/+45
|\ \ \ \
| * | | | Add support for deltas_only under GitalyAhmad Sherif2017-05-132-29/+45
* | | | | Update SystemHooks API to expose and handle new repository_update_eventsGabriel Mazetto2017-05-121-1/+1
* | | | | Added repository_update hookGabriel Mazetto2017-05-122-0/+45
* | | | | Remove trailing comma in dependency linker to satisfy RubocopStan Hu2017-05-121-1/+1
* | | | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-8/+34
|\ \ \ \ \
| * | | | | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-8/+34
* | | | | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-121-0/+1
|\ \ \ \ \ \
| * | | | | | Add hostname to usage pingSean McGivern2017-05-111-0/+1
* | | | | | | Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-128-133/+318
|\ \ \ \ \ \ \
| * | | | | | | Link Gemfile git URLsDouwe Maan2017-05-121-0/+3
| * | | | | | | Autolink package names in GemfileDouwe Maan2017-05-104-10/+176
| * | | | | | | Add Gitlab::StringRegexMarkerDouwe Maan2017-05-101-0/+13
| * | | | | | | Extract generic parts of Gitlab::Diff::InlineDiffMarkerDouwe Maan2017-05-103-123/+126
* | | | | | | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-124-2/+74
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid comma t the end of hashPawel Chojnacki2017-05-122-2/+2
| * | | | | | | | Custom queries for prometheusPawel Chojnacki2017-05-114-2/+74
* | | | | | | | | Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan2017-05-121-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Update rename_base.rbJames Lopez2017-05-121-1/+1
| * | | | | | | | Only rename namespaces and projects with an invalid pathBob Van Landuyt2017-05-121-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'backport_file_filder_from_ee' into 'master' Sean McGivern2017-05-122-17/+33
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Backport FileFinder from EEbackport_file_filder_from_eeValery Sizov2017-05-122-17/+33
* | | | | | | | Merge branch 'remove-deltas-only' into 'master' Sean McGivern2017-05-121-11/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove deltas_only from DiffCollectionJacob Vosmaer2017-05-111-11/+0
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'fixes_for_multiple_issue_assignees' into 'master' Sean McGivern2017-05-121-4/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fix for Follow-up from "Backport of Multiple Assignees featurefixes_for_multiple_issue_assigneesValery Sizov2017-05-111-4/+4
| |/ / / / / /
* | | | | | | Add a new column before creating rename triggersBob Van Landuyt2017-05-111-10/+10
|/ / / / / /
* | | | | | Implement auxiliary blob viewersDouwe Maan2017-05-101-1/+2
| |_|/ / / |/| | | |
* | | | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'mas...Robert Speicher2017-05-1029-41/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-1012-12/+12
| * | | | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-1019-29/+29
* | | | | Merge branch 'bvl-security-patches' into 'master' Robert Speicher2017-05-1012-37/+52
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use new SnippetsFinder signature in APIbvl-security-patchesBob Van Landuyt2017-05-101-2/+2
| * | | | Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-102-2/+2
| * | | | Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-104-8/+6
| * | | | Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-101-0/+4
| * | | | Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'Robert Speicher2017-05-101-18/+18
| * | | | Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-103-7/+20
* | | | | Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler from...Dosuken shinya2017-05-101-1/+1
* | | | | Merge branch 'feature/print-go-version-in-env-info' into 'master' Sean McGivern2017-05-101-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Print Go version in rake gitlab:env:infofeature/print-go-version-in-env-infoAhmad Sherif2017-05-101-0/+3
| |/ / /
* | | | Use relative paths for group/project/user avatarsblackst0ne2017-05-102-5/+16
|/ / /
* | | Merge branch 'deltas-only' into 'master' Sean McGivern2017-05-091-0/+4
|\ \ \
| * | | Don't use DiffCollection for deltasJacob Vosmaer2017-05-091-0/+4