summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix/gitaly-commit-diff-rpc-encoding-error' into 'master'Robert Speicher2017-09-201-1/+1
| | | | | | | Encode paths properly for Gitaly Commit{Diff,Delta} Closes gitaly#589 See merge request gitlab-org/gitlab-ce!14361
* Merge branch 'fix/gb/fix-moving-issue-with-ambiguous-references' into 'master'Rémy Coutable2017-09-201-0/+6
| | | | | | | Fix rewriting issue references with group milestones Closes #37746 See merge request gitlab-org/gitlab-ce!14294
* Merge branch 'fix-share-with-group-lock-update' into 'master'Robert Speicher2017-09-152-3/+28
| | | | | | | Fix setting share_with_group_lock Closes #37916 See merge request gitlab-org/gitlab-ce!14300
* Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'10-0-stable-prepare-rc3Grzegorz Bizon2017-09-141-1/+1
| | | | | | | Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#provider Closes #37845 See merge request gitlab-org/gitlab-ce!14263
* Merge branch ↵Douwe Maan2017-09-141-1/+2
| | | | | | | | | '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master' Resolve "Renamed files have escaped HTML for the inline diff in the header" Closes #37576 See merge request gitlab-org/gitlab-ce!14121
* Merge branch 'fix/gpg-tmp-dir-removal-race-condition' into 'master'Rémy Coutable2017-09-141-4/+10
| | | | | | | | | | | | | Fix: GPG tmp dir removal race condition Ignore any errors when removing the tmp directory, as we may run into a race condition: The `gpg-agent` agent process may clean up some files as well while `FileUtils.remove_entry` is iterating the directory and removing all its contained files and directories recursively, which could raise an error. Closes #36998 See merge request !14194
* Merge branch 'zj-usage-data-auto-devops' into 'master'Kamil Trzciński2017-09-141-0/+4
| | | | | | | Add usage ping for Auto DevOps Closes #37648 See merge request !14162
* Merge branch 'rs-pick-security-into-master' into 'master'Douwe Maan2017-09-081-10/+23
| | | | | Update master with 9.5.4 security patches See merge request !14131
* Merge branch ↵Douwe Maan2017-09-071-2/+8
|\ | | | | | | | | | | | | | | | | '35558-only-one-garbage-collection-should-be-running-per-project-at-once' into 'master' Adds exclusive lease to Git garbage collect worker. Closes #35558 See merge request !14036
| * 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
|\ \ | | | | | | | | | | | | | | | | | | Add JSON logger in `log/api_json.log` for Grape API endpoints Closes #36189 See merge request !14102
| * | 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
| |/ | | | | | | Closes #36189
* | Gitaly feature toggles are on by default in development environmentsAndrew Newdigate2017-09-071-8/+28
| |
* | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-09-074-2/+86
|\ \ | | | | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * \ Merge branch ↵Sean McGivern2017-09-071-0/+84
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
| | * | 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 setup Closes #37241 See merge request !13932
| | * | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-062-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finishes the procedure for migrating events from the old format into the new format. Code no longer uses the old setup and the database tables used during the migration process are swapped, with the old table being dropped. While the database migration can be reversed this will 1) take a lot of time as data has to be coped around 2) won't restore data in the "events.data" column as we have no way of restoring this. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241
| * | | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-071-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Group boards CE backport See merge request !13883
| | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-09-0656-166/+1267
| | |\ \ \ | | | |/ / | | | | | | | | | | ee_issue_928_backport
| | * | | 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 ↵Kamil Trzcinski2017-09-0615-170/+333
|\ \ \ \ | |/ / / | | | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * | | 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 Gitaly See merge request !13864
| | * | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First time contributor badge Closes #35161 See merge request !13902
| | * | | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this will remove the need make N queries (per-note) at the cost of having to mark notes with an attribute this opens up the possibility for other special roles for notes
| * | | | Merge branch 'url-sanitizer-fixes' into 'master'Douwe Maan2017-09-061-6/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems sanitizing URLs with empty passwords Closes gitlab-ee#3352 See merge request !14083
| | * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for downloading a single job artifact Closes #37196 See merge request !14027
| | * \ \ \ Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into ↵Grzegorz Bizon2017-09-0613-26/+467
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits)
| | * | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API fix for non UTF-8 data Closes #35942 See merge request !14038
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | remove some lint
| | * | | | | 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