summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-143-2/+111
|\
| * Implement diff viewersDouwe Maan2017-06-143-2/+111
* | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-141-6/+6
|\ \ | |/ |/|
| * Backport EE changes to the Kubernetes serviceNick Thomas2017-06-141-6/+6
* | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-143-3/+5
|\ \ | |/ |/|
| * 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 'feature/add-support-for-services-configuration' into 'master'Grzegorz Bizon2017-06-145-4/+104
|\ \
| * | Remove Gitlab::Ci::Config::Entry::DockerImageTomasz Maczukin2017-06-123-34/+23
| * | Send new configuration options with job's payloadTomasz Maczukin2017-06-121-2/+9
| * | Add support for docker image configuration in .gitlab-ci.ymlTomasz Maczukin2017-06-125-2/+106
| |/
* | Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-141-0/+4
|\ \
| * | Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-131-1/+1
| * | Allow to access pipelines even if they are disabled, but only present jobs an...Kamil Trzcinski2017-06-131-0/+4
* | | Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_time...32054-rails-should-use-timestamptz-database-type-for-postgresqlblackst0ne2017-06-131-0/+33
|/ /
* | Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-123-0/+68
|\ \
| * | Ensure peek-performance_bar doesn't break existing functionalitiesRémy Coutable2017-06-091-0/+22
| * | Fix spec failures and add a feature flag for the performance barRémy Coutable2017-06-091-1/+1
| * | Fix Rubocop offenses, improve SQL duration format and changelog entryRémy Coutable2017-06-091-1/+2
| * | Display queries duration in performance bar queries modalRémy Coutable2017-06-092-42/+8
| * | Store Sherlock::Query in Peek adapterRémy Coutable2017-06-092-0/+72
| * | New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-091-0/+7
* | | Merge branch 'background-migrations' into 'master'30404-high-cpu-usage-on-mrs-with-large-diffsRémy Coutable2017-06-122-0/+31
|\ \ \
| * | | Add the ability to perform background migrationsYorick Peterse2017-06-122-0/+31
| | |/ | |/|
* | | Merge branch '33525-use-git-diff-instead-of-git-format-patch' into 'master'Robert Speicher2017-06-121-7/+3
|\ \ \ | |/ / |/| |
| * | Generate patch with git diff instead of git format-patch33525-use-git-diff-instead-of-git-format-patchRémy Coutable2017-06-091-7/+3
| |/
* | 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