summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '42332-actionview-template-error-366-524-out-of-range' into 'mas...Douwe Maan2018-02-221-1/+11
|\
| * Fix 500 error when diff context line has broken encoding42332-actionview-template-error-366-524-out-of-rangeSean McGivern2018-02-221-1/+11
* | Merge branch 'fix-squash-with-renamed-files' into 'master'Grzegorz Bizon2018-02-221-1/+1
|\ \
| * | Fix squash with renamed filesfix-squash-with-renamed-filesSean McGivern2018-02-191-1/+1
* | | Merge branch 'zj-branch-contains-git-message' into 'master'Douwe Maan2018-02-221-10/+16
|\ \ \
| * | | Handle branch and tag names which are commit idsZeger-Jan van de Weg2018-02-211-10/+16
| | |/ | |/|
* | | Merge branch 'ce-gitaly-squash-in-progress' into 'master'Grzegorz Bizon2018-02-222-1/+24
|\ \ \
| * | | Incorporate Gitaly's RepositoryService.IsSquashInProgress RPCce-gitaly-squash-in-progressAlejandro Rodríguez2018-02-212-1/+24
* | | | Fix repo existence check in GitAccessWikiJacob Vosmaer (GitLab)2018-02-222-1/+11
* | | | Merge branch 'mk-improve-background-migration-specs' into 'master'Stan Hu2018-02-212-153/+208
|\ \ \ \
| * | | | Use convenient Rails helpermk-improve-background-migration-specsMichael Kozono2018-02-211-1/+1
| * | | | Explicitly reference redefined modelsMichael Kozono2018-02-202-152/+149
| * | | | Remove codebase dependencies from a BG migrationMichael Kozono2018-02-162-6/+64
* | | | | Merge branch '36847-update-update-toml-rb-to-1.0.0' into 'master'Rémy Coutable2018-02-212-3/+3
|\ \ \ \ \
| * | | | | 36847 - update toml-rb to 1.0.0Ken2018-02-212-3/+3
* | | | | | Merge branch 'add-pagination-commit-diffs' into 'master'Robert Speicher2018-02-211-1/+4
|\ \ \ \ \ \
| * | | | | | Add missing pagination on the commit diff endpointMaxime Roussin-Belanger2018-02-191-1/+4
* | | | | | | Resolve "API: PUT /projects/:id fails when only ci_config_path is specified"Kárpáti László2018-02-211-0/+1
* | | | | | | Merge branch 'sh-guard-against-nil-sidekiq-metrics-server' into 'master'Robert Speicher2018-02-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Guard against nil Sidekiq metrics serversh-guard-against-nil-sidekiq-metrics-serverStan Hu2018-02-201-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '40668-pages-domain-api-returns-404-when-using-a-specific-domain...Rémy Coutable2018-02-211-4/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix get a single pages domain when project path contains a periodTravis Miller2018-02-191-4/+6
| | |/ / / / | |/| | | |
* | | | | | Do not count rails sql cache as queries in query limitingquery-counting-should-not-include-cached-queriesDylan Griffith2018-02-211-2/+4
| |/ / / / |/| | | |
* | | | | Merge branch '43424-put_all_event_metrics_behind_feature_flags' into 'master'Douwe Maan2018-02-201-2/+3
|\ \ \ \ \
| * | | | | Only use features for eventsPawel Chojnacki2018-02-201-3/+3
| * | | | | Put all event metrics exposed to prometheus behind a feature flagPawel Chojnacki2018-02-201-0/+1
| | |/ / / | |/| | |
* | | | | [GH Import] Create an empty wiki if wiki import failedValery Sizov2018-02-191-0/+1
* | | | | Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'Sean McGivern2018-02-192-3/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Avoid slow File Lock checks when not usedJames Edwards-Jones2018-02-192-3/+8
* | | | | Merge branch '32564-fix-double-system-closing-notes' into 'master'Sean McGivern2018-02-191-1/+1
|\ \ \ \ \
| * | | | | Convert Gitaly commit parent IDs to array as early as possibleSean McGivern2018-02-191-10/+1
| * | | | | applying feedback32564-fix-double-system-closing-notesMicaël Bergeron2018-02-161-1/+2
| * | | | | fix specsMicaël Bergeron2018-02-161-0/+8
| | |_|/ / | |/| | |
* | | | | Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'Sean McGivern2018-02-191-0/+1
|\ \ \ \ \
| * | | | | Fix squash rebase not working when diff contained encoded datash-fix-squash-rebase-utf8-dataStan Hu2018-02-181-0/+1
| |/ / / /
* | | | | Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'Douwe Maan2018-02-191-1/+3
|\ \ \ \ \
| * | | | | Fix Error 500 when viewing a commit with a GPG signature in GeoStan Hu2018-02-191-1/+3
| |/ / / /
* | | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-191-6/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Validate SSH keys through the sshkey gemrd-40552-gitlab-should-check-if-keys-are-valid-before-savingRubén Dávila2018-02-161-1/+1
| * | | | Revert "Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-u...Rubén Dávila2018-02-151-6/+22
* | | | | Merge branch '42050-combine-all-rake-based-lints-in-one-rake-process-in-ci' i...Robert Speicher2018-02-161-0/+49
|\ \ \ \ \
| * | | | | Run lint:all tasks in forks42050-combine-all-rake-based-lints-in-one-rake-process-in-ciRémy Coutable2018-02-141-11/+32
| * | | | | Combine all rake tasks in the static-analysis jobRémy Coutable2018-02-141-0/+28
* | | | | | Fix project import API after import service refactorJames Lopez2018-02-161-2/+6
* | | | | | Merge branch '41899-api-endpoint-for-importing-a-project-export' into 'master'Sean McGivern2018-02-163-0/+73
|\ \ \ \ \ \
| * | | | | | update docsJames Lopez2018-02-161-1/+1
| * | | | | | refactor code based on feedback41899-api-endpoint-for-importing-a-project-exportJames Lopez2018-02-141-1/+1
| * | | | | | refactor code based on feedbackJames Lopez2018-02-141-7/+10
| * | | | | | refactor api classJames Lopez2018-02-131-3/+5
| * | | | | | add docs and changelogJames Lopez2018-02-131-1/+1
View Lorry Controller Status