summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-refactor-current-settings' into 'master'Robert Speicher2017-06-192-0/+63
|\
| * If migrations are pending, make CurrentSettings use existing values and popul...sh-refactor-current-settingsStan Hu2017-06-192-0/+63
* | Merge branch 'moved-submodules' into 'master'Rémy Coutable2017-06-192-4/+32
|\ \
| * | repository: index submodules by pathDavid Turner2017-06-162-4/+32
* | | Add “Project moved” error to Git-over-SSHMichael Kozono2017-06-163-15/+106
| |/ |/|
* | Merge branch 'merge-request-diffs-table' into 'master'Douwe Maan2017-06-167-12/+108
|\ \
| * | Add table for files in merge request diffsSean McGivern2017-06-167-12/+108
* | | Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-161-0/+24
|\ \ \ | |/ / |/| |
| * | Subgroups page should show groups authorized through inheritanceToon Claes2017-06-151-0/+24
* | | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-1614-19/+19
|\ \ \
| * | | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-1514-19/+19
| |/ /
* | | Merge branch 'deprecate-gitaly-path' into 'master'Sean McGivern2017-06-153-8/+14
|\ \ \
| * | | Stop using deprecated `path` field on Gitaly messagesAlejandro Rodríguez2017-06-143-8/+14
* | | | Merge branch 'dm-fix-parser-cache' into 'master'Sean McGivern2017-06-151-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't return nil for missing objects from parser cachedm-fix-parser-cacheDouwe Maan2017-06-141-1/+1
* | | | Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-1446-137/+430
|/ / /
* | | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-141-0/+301
|\ \ \ | |/ / |/| |
| * | Implement diff viewersDouwe Maan2017-06-141-0/+301
* | | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-141-0/+10
|\ \ \ | |/ / |/| |
| * | Backport EE changes to the Kubernetes serviceNick Thomas2017-06-141-0/+10
* | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-142-52/+25
|\ \ \ | |/ / |/| |
| * | Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-122-52/+25
* | | Merge branch 'feature/add-support-for-services-configuration' into 'master'Grzegorz Bizon2017-06-147-124/+395
|\ \ \
| * | | Improve specs for GitlabCiYamlProcessorTomasz Maczukin2017-06-121-50/+105
| * | | Send new configuration options with job's payloadTomasz Maczukin2017-06-121-8/+53
| * | | Add support for docker image configuration in .gitlab-ci.ymlTomasz Maczukin2017-06-126-73/+244
| |/ /
* | | Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-141-1/+8
|\ \ \
| * | | Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-131-1/+8
* | | | Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_time...32054-rails-should-use-timestamptz-database-type-for-postgresqlblackst0ne2017-06-131-1/+36
|/ / /
* | | Merge branch 'background-migrations' into 'master'30404-high-cpu-usage-on-mrs-with-large-diffsRémy Coutable2017-06-121-0/+48
|\ \ \
| * | | Add the ability to perform background migrationsYorick Peterse2017-06-121-0/+48
| |/ /
* | | Use :request_store hooks on specsuse-request-store-helper-instead-actual-codeOswaldo Ferreira2017-06-093-30/+3
|/ /
* | Merge branch 'pat-msg-on-auth-failure' into 'master'Rémy Coutable2017-06-091-0/+6
|\ \
| * | Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-071-0/+6
* | | Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-081-0/+11
|\ \ \
| * | | Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-073-6/+196
| |/ /
* | | Merge branch '25934-project-snippet-vis' into 'security-9-2'DJ Mountney2017-06-082-6/+185
| |/ |/|
* | Merge branch 'dm-diff-file-diffable' into 'master'Sean McGivern2017-06-083-54/+27
|\ \
| * | Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-083-54/+27
| |/
* | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-081-24/+13
|/
* Merge branch 'krakowski_master2' into 'master'Grzegorz Bizon2017-06-071-28/+83
|\
| * Add source policy specShinya Maeda2017-06-081-0/+19
| * Fix typo in testFilip Krakowski2017-06-081-1/+1
| * Fix static-analysis offenses (again)Filip Krakowski2017-06-081-18/+18
| * Fix static-analysis offensesFilip Krakowski2017-06-081-6/+6
| * Add all sources as special keywords for only and exceptFilip Krakowski2017-06-081-71/+63
| * Use pipeline.source to determine what triggered a pipelineFilip Krakowski2017-06-081-4/+4
| * Add 'schedules' keyword to 'only' and 'except'Filip Krakowski2017-06-081-0/+44
* | Added more actions and report as abuse to all notesLuke "Jared" Bennett2017-06-071-0/+11
* | Merge branch 'fix/backup-restore-resume' into 'master'James Lopez2017-06-071-0/+63
|\ \