summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-122-3/+3
* Fix etag route missesZ.J. van de Weg2017-06-121-2/+2
* Raise exception on invalid pipeline cacheKamil Trzcinski2017-06-121-0/+2
* Merge branch 'cache-diff-size-limits' into 'master'Douwe Maan2017-06-091-2/+18
|\
| * Only look up diff size limit flags once per requestcache-diff-size-limitsSean McGivern2017-06-091-2/+18
* | Merge branch 'pat-msg-on-auth-failure' into 'master'Rémy Coutable2017-06-091-1/+5
|\ \
| * | Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-071-1/+5
| |/
* | Merge branch 'dm-blob-binaryness-change' into 'master'Sean McGivern2017-06-091-0/+1
|\ \
| * | Detect if file that appears to be text in the first 1024 bytes is actually bi...dm-blob-binaryness-changeDouwe Maan2017-06-081-0/+1
* | | 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-072-1/+2
| |/
* | 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-082-2/+2
|\ \ \ | |_|/ |/| |
| * | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-072-2/+2
* | | Translate project & repository pagesBob Van Landuyt2017-06-0711-23/+23
|/ /
* | Added more actions and report as abuse to all notesLuke "Jared" Bennett2017-06-071-1/+6
* | Merge branch 'backport_fix_slash_commands_for_multiple_assignee' into 'master'Douwe Maan2017-06-072-4/+10
|\ \
| * | Backport Fix '/unassign' slash commandbackport_fix_slash_commands_for_multiple_assigneeValery Sizov2017-06-072-4/+10
* | | Merge branch 'sync-email-from-omniauth' into 'master'Douwe Maan2017-06-072-9/+21
|\ \ \
| * | | Sync email address from specified omniauth providerRobin Bobbitt2017-06-072-9/+21
* | | | Merge branch 'fix-memoization-in-contributions-calendar' into 'master'Rémy Coutable2017-06-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix memoization in ContributionsCalendar#activity_datesfix-memoization-in-contributions-calendarSean McGivern2017-06-071-1/+1
* | | | Use key? instead of has_key? methodfix_rubocop_warning_about_has_keyPawel Chojnacki2017-06-071-1/+1
* | | | Merge branch 'dm-diff-file-straight-diff' into 'master'Sean McGivern2017-06-074-18/+14
|\ \ \ \
| * | | | Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diffDouwe Maan2017-06-064-18/+14
| |/ / /
* | | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-074-1/+52
|\ \ \ \
| * \ \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-0610-87/+267
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-0563-591/+1453
| |\ \ \ \
| * | | | | Export pipeline stages in import/export featureGrzegorz Bizon2017-06-052-0/+2
| * | | | | Refine implementation of pipeline stage seedsGrzegorz Bizon2017-06-022-62/+49
| * | | | | Rename pipeline methods related to legacy stagesGrzegorz Bizon2017-06-011-1/+1
| * | | | | Return stage seeds object from YAML processorGrzegorz Bizon2017-05-311-1/+5
| * | | | | Refine pipeline stages seeds classGrzegorz Bizon2017-05-312-38/+58
| * | | | | Add stage seed class that represents attributesGrzegorz Bizon2017-05-301-0/+38
* | | | | | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-075-154/+264
|\ \ \ \ \ \
| * | | | | | Make PrometheusTextFormat return proper output terminated with '\n'Pawel Chojnacki2017-06-021-1/+1
| * | | | | | Add missing trailing newlinesPawel Chojnacki2017-06-023-3/+3
| * | | | | | Fix circular dependency condition with `current_application_settings`Pawel Chojnacki2017-06-021-14/+21
| * | | | | | Split the metrics implementation to separate modules for Influx and PrometheusPawel Chojnacki2017-06-024-219/+235
| * | | | | | Add prometheus text formatterPawel Chojnacki2017-06-022-10/+1
| * | | | | | Move Prometheus presentation logic to PrometheusTextPawel Chojnacki2017-06-023-17/+45
| * | | | | | Add tests for metrics behaviorPawel Chojnacki2017-06-021-7/+9