summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | Pass Gitaly token on Ruby gRPC requestsJacob Vosmaer2017-06-194-27/+44
| * | | | Merge branch 'remove-git-commit-attribute' into 'master'Sean McGivern2017-06-211-1/+1
| |\ \ \ \
| | * | | | Remove unused attr_accessor from Gitlab::Git::CommitJacob Vosmaer2017-06-201-1/+1
| | |/ / /
| * | | | Change references from ApplicationSetting to ::ApplicationSetting to make aut...sh-current-settings-autoload-fixStan Hu2017-06-201-5/+5
| * | | | Merge branch 'bugfix/html-email-brackets' into 'master'Douwe Maan2017-06-201-0/+7
| |\ \ \ \
| | * | | | unwrap all links with no hrefhttp://jneen.net/2017-06-191-0/+7
| * | | | | Merge branch '28517-discover-by-userid' into 'master'Douwe Maan2017-06-201-3/+8
| |\ \ \ \ \
| | * | | | | Allow discover by userid - issue 28517Matt Walsh2017-06-201-3/+8
| * | | | | | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-201-12/+14
| |\ \ \ \ \ \
| | * | | | | | Refactor ProjectsFinder#init_collectionYorick Peterse2017-06-161-12/+14
| * | | | | | | Re-instate is_admin flag in users API is current user is an adminMike Ricketts2017-06-202-3/+6
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-201-1/+15
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | use proper `if defined?` check.33823_do_not_enable_defaults_when_metrics_folder_is_missingPawel Chojnacki2017-06-201-2/+5
| | * | | | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-191-1/+12
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'sh-refactor-current-settings' into 'master'Robert Speicher2017-06-192-20/+53
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | If migrations are pending, make CurrentSettings use existing values and popul...sh-refactor-current-settingsStan Hu2017-06-192-22/+54
| | * | | | Revert "Merge branch 'rs-revert-11842' into 'master'"Stan Hu2017-06-191-1/+2
| | | |_|/ | | |/| |
| * | | | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-192-20/+20
| |\ \ \ \
| | * | | | Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-192-20/+20
| * | | | | Merge branch 'moved-submodules' into 'master'Rémy Coutable2017-06-192-37/+92
| |\ \ \ \ \
| | * | | | | repository: index submodules by pathDavid Turner2017-06-162-37/+92
| * | | | | | Merge branch 'update-column-in-batches-batch-size' into 'master'Rémy Coutable2017-06-191-0/+6
| |\ \ \ \ \ \
| | * | | | | | Put an upper limit on update batchesupdate-column-in-batches-batch-sizeYorick Peterse2017-06-191-0/+6
| * | | | | | | Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timingsYorick Peterse2017-06-191-1/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master'Douwe Maan2017-06-194-10/+41
| |\ \ \ \ \ \
| | * | | | | | Add “Project moved” error to Git-over-SSHMichael Kozono2017-06-164-10/+41
| * | | | | | | Merge branch 'add-since-and-until-params-to-issuables' into 'master'Rémy Coutable2017-06-192-0/+4
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |