summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* If migrations are pending, make CurrentSettings use existing values and popul...sh-refactor-current-settingsStan Hu2017-06-192-0/+63
* 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
* | Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-1436-125/+392
* | 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-146-65/+281
|\ \
| * | 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-125-57/+228
| |/
* | 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
|/ /
* | Add the ability to perform background migrationsYorick Peterse2017-06-121-0/+48
|/
* 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-071-0/+11
| |/
* | 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
|/
* 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
|\
| * refactor code and specJames Lopez2017-06-071-9/+4
| * fix spec and added changelogJames Lopez2017-06-071-2/+2
| * fix spec and added changelogJames Lopez2017-06-071-2/+0
| * add more spec examplesJames Lopez2017-06-071-6/+41
| * add repository specJames Lopez2017-06-071-0/+35
* | Sync email address from specified omniauth providerRobin Bobbitt2017-06-072-9/+49
* | Merge branch 'dm-diff-file-straight-diff' into 'master'Sean McGivern2017-06-073-2/+111
|\ \
| * | Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diffDouwe Maan2017-06-063-2/+111
* | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-073-1/+72
|\ \ \
| * \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-069-99/+390
| |\ \ \
| * | | | Improve specs for pipeline and pipeline seedsGrzegorz Bizon2017-06-051-1/+1
| * | | | Fix typo in import/export safe model attributesGrzegorz Bizon2017-06-051-1/+1
| * | | | Add assertions about new pipeline stage in specsGrzegorz Bizon2017-06-051-0/+4
| * | | | Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-0545-519/+1867
| |\ \ \ \
| * | | | | Export pipeline stages in import/export featureGrzegorz Bizon2017-06-052-0/+14
| * | | | | Fix invalid conditional in pipeline create serviceGrzegorz Bizon2017-06-021-2/+1
| * | | | | Refine implementation of pipeline stage seedsGrzegorz Bizon2017-06-022-66/+54
| * | | | | Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-011-0/+1
| |\ \ \ \ \
View Lorry Controller Status