summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_u...Rémy Coutable2017-07-041-0/+2
* Merge branch 'gitaly-encodings' into 'master'Robert Speicher2017-06-293-11/+20
* Merge branch 'fix-head-pipeline-for-commit-status' into 'master'Grzegorz Bizon2017-06-281-0/+3
* Merge branch 'dm-dependency-linker-newlines' into 'master'Robert Speicher2017-06-281-1/+1
* Merge branch 'backport-system-check-fix' into 'master'Douwe Maan2017-06-271-0/+2
* Merge branch '34282-fix-api-using-include_missing-false' into 'master'Grzegorz Bizon2017-06-271-1/+1
* Merge branch 'dm-requirements-txt-tilde' into 'master'Grzegorz Bizon2017-06-261-1/+1
* Merge branch 'fix/properly-encode-gitaly-diffs' into 'master'Robert Speicher2017-06-262-2/+5
* Merge branch '33940-cache-flipper_gate-query' into 'master'Robert Speicher2017-06-231-2/+0
* Merge branch 'fix-33259' into 'master'Sean McGivern2017-06-213-35/+63
* Merge branch '33878-fix-edit-deploy-key' into 'master'Rémy Coutable2017-06-211-1/+1
* Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-201-12/+14
* Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-201-1/+15
* Merge branch '33260-allow-admins-to-list-admins' into 'master'Rémy Coutable2017-06-202-3/+6
* Merge branch 'sh-refactor-current-settings' into 'master'Robert Speicher2017-06-192-20/+53
* Merge branch 'reduce-sidekiq-wait-timings' into 'master'Rémy Coutable2017-06-191-1/+1
* Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-192-20/+20
* Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-191-0/+4
* Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-191-18/+25
* Merge branch '9-3-stable-rc3-i18n' into '9-3-stable-rc4'Clement Ho2017-06-199-5/+171
|\
| * Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-154-0/+164
| * Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-153-3/+5
| * Merge branch 'fix-github-clone-wiki' into 'master'Sean McGivern2017-06-151-1/+1
| * Merge branch 'dm-fix-parser-cache' into 'master'Sean McGivern2017-06-151-1/+1
* | Merge branch 'rs-revert-11842' into 'master'Stan Hu2017-06-161-2/+1
|/
* Merge branch 'cache-diff-size-limits' into 'master'Douwe Maan2017-06-131-2/+18
* Resolve inconsistenciesClement Ho2017-06-091-8/+0
* Merge commit 'b1bf6d88fceb24663bfe4be2d9cc111710d9126b' into 9-3-stableClement Ho2017-06-0911-40/+57
|\
| * Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-082-1/+2
| |\
| | * Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-0712-11/+17
| * | Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney2017-06-089-10/+14
| * | Merge branch 'dz-api-x-frame' into 'security-9-2'DJ Mountney2017-06-081-0/+1
| * | Merge branch 'dm-diff-file-diffable' into 'master'Sean McGivern2017-06-083-9/+13
| |\ \
| | * | Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-083-22/+38
| * | | Merge branch 'dm-highlight-diff-file-blob' into 'master'Sean McGivern2017-06-083-27/+36
| |\ \ \
| | * | | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-083-27/+36
| | |/ /
| * | | Merge branch '33383_add_bulgarian_translation_of_cycle_analytics_page' into '...Douwe Maan2017-06-081-1/+2
| |\ \ \
| | * | | add bulgarian translation of cycle analytics page to I18N黄涛2017-06-071-1/+2
| * | | | Merge branch '33334_add_portuguese_brazil_translation_of_cycle_analytics_page...Douwe Maan2017-06-081-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Update i18n.rb styleHuang Tao2017-06-071-1/+1
| | * | | add portuguese brazil translation of cycle analytics page黄涛2017-06-071-0/+1
| | |/ /
| * | | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-084-4/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-074-4/+4
* | | | Merge commit 'abc61f260074663e5711d3814d9b7d301d07a259' into 9-3-stableClement Ho2017-06-09218-1994/+4297
|\ \ \ \ | |/ / /
| * | | remove the rouge copypasta and add notes to refactorhttp://jneen.net/2017-06-072-28/+4
| * | | Translate project & repository pagesBob Van Landuyt2017-06-0711-23/+23
| * | | Merge branch 'krakowski_master2' into 'master'Grzegorz Bizon2017-06-071-20/+31
| |\ \ \ | | |/ / | |/| |
| | * | use squre bracketShinya Maeda2017-06-081-1/+1
| | * | Use source instead of trigger_requests in stage_seedsShinya Maeda2017-06-082-5/+2
| | * | Remove source.nilShinya Maeda2017-06-081-3/+3