summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rails5-fix-46230' into 'master'Rémy Coutable2018-05-311-6/+6
|\
| * Use strings as properties key in kubernetes service spec.Jasper Maes2018-05-301-6/+6
* | Merge branch '46445-fix-gitaly-tree-entry-encoding' into 'master'Douwe Maan2018-05-315-4/+12
|\ \
| * | Fix encoding error in Gitaly::Commit::TreeEntryKim "BKC" Carlbäcker2018-05-305-4/+12
| |/
* | Resolve "Remove links from Web IDE unexpectedly navigate you to a different p...Sam Beckham2018-05-312-61/+35
* | Merge branch '46903-osw-fix-permitted-params-filtering-on-merge-scheduling' i...Sean McGivern2018-05-311-2/+2
|\ \
| * | Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-schedulingOswaldo Ferreira2018-05-301-2/+2
| |/
* | Merge branch 'rails5-cattr' into 'master'Douwe Maan2018-05-311-3/+1
|\ \
| * | Fix cattr_accessor definitionJan Provaznik2018-05-281-3/+1
* | | Merge branch 'fj-36819-remove-v3-api' into 'master'Douwe Maan2018-05-3143-10624/+323
|\ \ \
| * | | Removed API endpoint and specsfj-36819-remove-v3-apiFrancisco Javier López2018-05-3043-10624/+323
| | |/ | |/|
* | | Merge branch 'leipert-upgrade-eslint' into 'master'Mike Greiling2018-05-3014-72/+53
|\ \ \ | |/ / |/| |
| * | Convert spec/javascripts/.eslintrc to yml format as wellLukas Eipert2018-05-302-33/+34
| * | fix last lintsLukas Eipert2018-05-293-10/+9
| * | fix `spaced-comment`Lukas Eipert2018-05-291-1/+1
| * | remove unused createComponentWithMixin from vue spec helpersLukas Eipert2018-05-291-21/+9
| * | fix `no-unused-vars`Lukas Eipert2018-05-297-7/+0
* | | Merge branch 'sh-use-grape-path-helpers' into 'master'Sean McGivern2018-05-302-14/+12
|\ \ \
| * | | Replace grape-route-helpers with our own grape-path-helpersStan Hu2018-05-302-14/+12
* | | | Merge branch 'sh-simplify-issues-spec' into 'master'Douwe Maan2018-05-301-1/+1
|\ \ \ \
| * | | | Simplify spec: `2.times.each` -> `2.times`Stan Hu2018-05-301-1/+1
* | | | | Merge branch '46917-gitlab-is-not-sending-objectstore-timeout-value-to-workho...Kamil Trzciński2018-05-301-0/+2
|\ \ \ \ \
| * | | | | Fix missing timeout value in object storage pre-authorization callAlessio Caiazza2018-05-291-0/+2
* | | | | | Merge branch 'bvl-group-shared-projects-private-api' into 'master'Sean McGivern2018-05-301-0/+59
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix small typosToon Claes2018-05-291-4/+4
| * | | | | Add `shared_projects` endpointBob Van Landuyt2018-05-291-0/+59
* | | | | | Merge branch 'brodock-refactor-hashed-storage-task' into 'master'Douwe Maan2018-05-301-4/+100
|\ \ \ \ \ \
| * | | | | | Specs covering listing all gitlab:storage:* typesbrodock-refactor-hashed-storage-taskGabriel Mazetto2018-05-291-4/+100
* | | | | | | Merge branch 'fix/bitbucket_import_anonymous' into 'master'Douwe Maan2018-05-301-0/+30
|\ \ \ \ \ \ \
| * | | | | | | Import bitbucket issues that are reported by an anonymous userBart Libert2018-05-241-0/+30
* | | | | | | | Merge branch 'sh-fix-submit-not-clearing-local-storage' into 'master'Filipa Lacerda2018-05-302-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a regression test for clearing local storage upon issue creationStan Hu2018-05-291-0/+14
| * | | | | | | | Fix local storage not being cleared after creating a new issueStan Hu2018-05-291-1/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'mattermost-api-v4' into 'master'Sean McGivern2018-05-305-38/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated help text for team list for Mattermost slash commandsHarrison Healey2018-05-291-2/+2
| * | | | | | | | Updated Mattermost integration to use Mattermost API v4Harrison Healey2018-05-284-36/+38
* | | | | | | | | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-3012-21/+497
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-2912-21/+497
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '6045-extract-ee-specific-specs-lines' into 'master'Robert Speicher2018-05-299-38/+98
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce CE/EE diff in spec/controllers/projects/project_members_controller_spe...Rémy Coutable2018-05-241-1/+1
| * | | | | | | | Reduce CE/EE diff in spec/controllers/projects/issues_controller_spec.rbRémy Coutable2018-05-241-1/+1
| * | | | | | | | Reduce CE/EE diff in spec/controllers/projects/imports_controller_spec.rbRémy Coutable2018-05-241-12/+6
| * | | | | | | | Reduce CE/EE diff in spec/controllers/projects/group_links_controller_spec.rbRémy Coutable2018-05-241-0/+12
| * | | | | | | | Reduce CE/EE diff in spec/controllers/projects/environments_controller_spec.rbRémy Coutable2018-05-241-0/+7
| * | | | | | | | Reduce CE/EE diff in app/controllers/projects/clusters_controller.rbRémy Coutable2018-05-241-5/+4
| * | | | | | | | Reduce CE/EE diff in spec/controllers/projects/branches_controller_spec.rbRémy Coutable2018-05-241-0/+18
| * | | | | | | | Reduce CE/EE diff in spec/controllers/projects/boards_controller_spec.rbRémy Coutable2018-05-241-18/+48
| * | | | | | | | Reduce CE/EE diff in spec/controllers/boards/issues_controller_spec.rbRémy Coutable2018-05-241-1/+1
* | | | | | | | | Merge remote-tracking branch 'dev/master'Mayra Cabrera2018-05-297-5/+102
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'security-fj-import-export-assignment' into 'master'Mayra Cabrera2018-05-295-4/+50
| |\ \ \ \ \ \ \ \ \