summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/gitaly-commit-diff-rpc-encoding-error' into 'master'Robert Speicher2017-09-201-1/+1
* Merge branch 'fix/gb/fix-moving-issue-with-ambiguous-references' into 'master'Rémy Coutable2017-09-201-0/+6
* Merge branch 'fix-share-with-group-lock-update' into 'master'Robert Speicher2017-09-152-3/+28
* Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'10-0-stable-prepare-rc3Grzegorz Bizon2017-09-141-1/+1
* Merge branch '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-th...Douwe Maan2017-09-141-1/+2
* Merge branch 'fix/gpg-tmp-dir-removal-race-condition' into 'master'Rémy Coutable2017-09-141-4/+10
* Merge branch 'zj-usage-data-auto-devops' into 'master'Kamil Trzciński2017-09-141-0/+4
* Merge branch 'rs-pick-security-into-master' into 'master'Douwe Maan2017-09-081-10/+23
* Merge branch '35558-only-one-garbage-collection-should-be-running-per-project...Douwe Maan2017-09-071-2/+8
|\
| * Adds exclusive lease to Git garbage collect worker.35558-only-one-garbage-collection-should-be-running-per-project-at-onceTiago Botelho2017-09-071-2/+8
* | Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-071-0/+19
|\ \
| * | Use a custom GrapeLogging formatter to get the timestampsh-add-grape-loggingStan Hu2017-09-072-7/+19
| * | Fix Rubocop failures in API loggerStan Hu2017-09-071-1/+0
| * | Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-061-0/+8
| |/
* | Gitaly feature toggles are on by default in development environmentsAndrew Newdigate2017-09-071-8/+28
* | Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-074-2/+86
|\ \
| * \ Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-071-0/+84
| |\ \
| | * | Small refactor after last code review.35012-navigation-add-option-to-change-navigation-color-paletteRuben Davila2017-09-071-6/+4
| | * | Use indigo as default themeAnnabel Dunstone Gray2017-09-071-1/+1
| | * | Add previews in preferencesAnnabel Dunstone Gray2017-09-061-1/+1
| | * | Fix specs; start on light themeAnnabel Dunstone Gray2017-09-061-1/+3
| | * | Add blue themeAnnabel Dunstone Gray2017-09-061-1/+2
| | * | Add functionality for two themesAnnabel Dunstone Gray2017-09-061-6/+2
| | * | Restore some changes from !9199Rubén Dávila2017-09-061-0/+87
| | |/
| * | Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-072-2/+1
| |\ \
| | * | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-062-2/+1
| * | | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-071-0/+1
| |\ \ \
| | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-0656-166/+1267
| | |\ \ \ | | | |/ /
| | * | | Fix specs BACKPORTFelipe Artur2017-09-041-0/+1
* | | | | Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-072-7/+10
|\ \ \ \ \ | |/ / / /
| * | | | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-062-7/+10
| | |_|/ | |/| |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj...Kamil Trzcinski2017-09-0615-170/+333
|\ \ \ \ | |/ / /
| * | | Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-objectRobert Speicher2017-09-063-13/+66
| |\ \ \
| | * | | Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitalyAhmad Sherif2017-09-063-13/+66
| | | |/ | | |/|
| * | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-061-1/+5
| |\ \ \
| | * | | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-061-1/+5
| * | | | Merge branch 'url-sanitizer-fixes' into 'master'Douwe Maan2017-09-061-6/+13
| |\ \ \ \
| | * | | | Remove blank passwords from sanitized URLsNick Thomas2017-09-061-3/+10
| | * | | | Backport EE fixes to Gitlab::UrlSanitizer to CENick Thomas2017-09-061-6/+6
| | |/ / /
| * | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-063-124/+175
| |\ \ \ \
| | * \ \ \ Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/downl...Grzegorz Bizon2017-09-0613-26/+467
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Remove unneeded string interpolation from entry classGrzegorz Bizon2017-09-061-1/+1
| | * | | | Make it explicit that workhorse needs artifact pathGrzegorz Bizon2017-09-051-2/+2
| | * | | | Extract a class that represents artifacts file pathGrzegorz Bizon2017-09-052-122/+173
| * | | | | Merge branch '35942_api_binary_encoding' into 'master'Sean McGivern2017-09-063-10/+35
| |\ \ \ \ \
| | * | | | | remove useless commentmicael.bergeron2017-09-061-2/+0
| | * | | | | renames ambiguous methods and add specmicael.bergeron2017-09-063-7/+9
| | * | | | | fix refactoring error with Blob.binary?micael.bergeron2017-09-063-10/+10
| | * | | | | revert to using a simple representationmicael.bergeron2017-09-063-21/+24
| | * | | | | wip: fake its a binary diffmicael.bergeron2017-09-062-5/+27
| | | |_|/ / | | |/| | |
View Lorry Controller Status