summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix Gitlab::Database.bulk_insert for non-UTF-8 data34324-gitlab-db-seed-is-brokenSean McGivern2017-06-261-1/+1
* Merge branch 'feature/add-new-services' into 'master'Sean McGivern2017-06-265-16/+22
|\
| * fix spec failuresJames Lopez2017-06-241-1/+1
| * fix spec failuresJames Lopez2017-06-231-4/+4
| * update code based on feedbackJames Lopez2017-06-231-2/+4
| * refactor update user service not to do auth checksJames Lopez2017-06-235-5/+5
| * fix spec failuresJames Lopez2017-06-231-4/+6
| * more refactoring based on feedbackJames Lopez2017-06-232-5/+5
| * refactor emails serviceJames Lopez2017-06-231-8/+0
| * update missing email actionsJames Lopez2017-06-231-6/+4
| * fix specsJames Lopez2017-06-231-2/+2
| * update to use emails destroy serviceJames Lopez2017-06-231-2/+3
| * fixed specsJames Lopez2017-06-231-1/+1
| * added service in the rest of controllers and classesJames Lopez2017-06-233-4/+5
| * fix api and controller issuesJames Lopez2017-06-231-2/+7
| * update notification settings, fix api specsJames Lopez2017-06-232-2/+7
| * use update service on ldap call and updated specs and serviceJames Lopez2017-06-231-1/+1
* | Merge branch 'zj-faster-charts-page' into 'master'Grzegorz Bizon2017-06-261-9/+9
|\ \
| * | Remove references to build in pipeline chartsZ.J. van de Weg2017-06-231-4/+4
| * | Improve performance for pipeline chartsZ.J. van de Weg2017-06-231-5/+5
| |/
* | Merge branch 'dm-requirements-txt-tilde' into 'master'Grzegorz Bizon2017-06-231-1/+1
|\ \
| * | Don't match tilde and exclamation mark as part of requirements.txt package namedm-requirements-txt-tildeDouwe Maan2017-06-231-1/+1
* | | Merge branch 'tc-refactor-projects-finder-init-collection' into 'master'Douwe Maan2017-06-231-1/+1
|\ \ \
| * | | Add User#full_private_access? to check if user has Private accesstc-refactor-projects-finder-init-collectionToon Claes2017-06-231-1/+1
| | |/ | |/|
* | | Merge branch 'fix/gb/improve-updating-column-in-batches-helper' into 'master'Yorick Peterse2017-06-231-0/+6
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into fix/gb/improve-updating-column-in-batches-helperGrzegorz Bizon2017-06-2246-265/+361
| |\ \ | | |/
| * | Raise if updating columns in batches within a transactionGrzegorz Bizon2017-06-211-0/+6
* | | Merge branch '33940-cache-flipper_gate-query' into 'master'Robert Speicher2017-06-221-2/+0
|\ \ \
| * | | Fix Style/EmptyLines violation in lib/feature.rb33940-cache-flipper_gate-queryRobert Speicher2017-06-221-1/+0
| * | | Add the Flipper::Middleware::Memoizer middlewareRémy Coutable2017-06-211-1/+0
* | | | Merge branch 'fix/properly-encode-gitaly-diffs' into 'master'Robert Speicher2017-06-222-2/+5
|\ \ \ \
| * | | | Encode Gitaly diff patches properlyfix/properly-encode-gitaly-diffsAhmad Sherif2017-06-222-2/+5
* | | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branchPawel Chojnacki2017-06-22101-484/+800
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch '32301-filter-archive-project-on-param-present' into 'master'Rémy Coutable2017-06-222-2/+5
| |\ \ \ \
| | * | | | Filter archived project in API v3 only if param presentvanadium232017-06-212-2/+5
| | | |/ / | | |/| |
| * | | | Merge branch 'feature/migrate-blob-find-to-gitaly' into 'master'Robert Speicher2017-06-222-0/+65
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Migrate Gitlab::Git::Blob.find to Gitalyfeature/migrate-blob-find-to-gitalyAhmad Sherif2017-06-212-0/+65
| | | |/ | | |/|
| * | | Add a comment explaining how the branch clean up happensDouglas Barbosa Alexandre2017-06-211-0/+6
| * | | Fix Github::Representation::PullRequest#source_branch_exists?Douglas Barbosa Alexandre2017-06-211-1/+1
| * | | Fix GitHub importer performance on branch existence checkDouglas Barbosa Alexandre2017-06-213-35/+57
| | |/ | |/|
| * | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-2139-228/+228
| |/
| * Replace invalid chars while seeding environmentsZeger-Jan van de Weg2017-06-211-1/+1
| * Merge branch '33878-fix-edit-deploy-key' into 'master'Rémy Coutable2017-06-211-1/+1
| |\
| | * Fix edit button for deploy keys available from other projectsAlexander Randa2017-06-201-1/+1
| * | Merge branch 'dt/printing-to-api' into 'master'Rémy Coutable2017-06-212-0/+3
| |\ \
| | * | add printing_merge_request_link_enabled to APIDavid Turner2017-06-192-0/+3
| * | | Merge branch 'gitaly-auth-token' into 'master'Sean McGivern2017-06-216-32/+55
| |\ \ \
| | * | | Enable gitaly token auth when testingJacob Vosmaer2017-06-201-2/+3
| | * | | Rubocop and comment fixesJacob Vosmaer2017-06-202-3/+3
| | * | | Send gitaly token to workhorse when neededJacob Vosmaer2017-06-201-3/+8