summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'revert-e2aa2177' into 'master'Sean McGivern2018-11-2014-741/+1152
|\
| * Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"revert-e2aa2177Sean McGivern2018-11-2014-741/+1152
* | Merge branch 'fix/allow-saml2-for-2fa-bypass' into 'master'Douwe Maan2018-11-202-0/+67
|\ \
| * | saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses1151002018-10-252-0/+67
* | | Merge branch '40085-add-a-create_merge_request-quick-action' into 'master'Douwe Maan2018-11-205-3/+136
|\ \ \
| * | | Creates /create_merge_request quickaction40085-add-a-create_merge_request-quick-actionJacopo2018-11-145-3/+136
* | | | Merge branch '3062-improve-project-cache' into 'master'Douwe Maan2018-11-202-11/+29
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add `wiki` extra namespace when repository is_wiki: true3062-improve-project-cacheGabriel Mazetto2018-11-161-0/+18
| * | | Change specs to accept new cache keys for projectsGabriel Mazetto2018-11-161-11/+11
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSteve Azzopardi2018-11-203-7/+53
|\ \ \ \
| * \ \ \ Merge branch 'sh-fix-issue-54189' into 'master'Steve Azzopardi2018-11-202-1/+30
| |\ \ \ \
| | * | | | Prevent templated services from being importedStan Hu2018-11-192-1/+30
| * | | | | Merge branch 'security-2717-xss-username-autocomplete' into 'master'Steve Azzopardi2018-11-201-6/+23
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix user name autocomplete XSS when name contains HTMLKushal Pandya2018-11-121-6/+23
* | | | | | Merge branch '53290-incorrect-project-list-order-select-default-label' into '...Grzegorz Bizon2018-11-201-0/+7
|\ \ \ \ \ \
| * | | | | | Fix default sorting for subgroups and projects list53290-incorrect-project-list-order-select-default-labelJacopo2018-11-141-0/+7
* | | | | | | Resolve "Further UI improvements to Profile "Overview" tab"Martin Wortschack2018-11-202-16/+16
* | | | | | | Merge branch 'sh-fix-issue-8448-ce' into 'master'Steve Azzopardi2018-11-201-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Stub Rails.application.env_config to prevent spec failuressh-fix-issue-8448-ceStan Hu2018-11-191-1/+8
* | | | | | | | Refine cursor positioning in Markdown Editor for wrap tags.Johann Hubert Sonntagbauer2018-11-201-1/+30
|/ / / / / / /
* | | | | | | Merge branch 'zj-improve-gitaly-pb' into 'master'Sean McGivern2018-11-2014-1152/+741
|\ \ \ \ \ \ \
| * | | | | | | Remove duplicate tests for GitalyZeger-Jan van de Weg2018-11-1914-1152/+741
* | | | | | | | Merge branch 'rails5-active-record-class-value' into 'master'Stan Hu2018-11-192-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Rails5: Passing a class as a value in an Active Record query is deprecatedJasper Maes2018-11-172-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'gt-fix-typo-in-notebook-props' into 'master'Fatih Acet2018-11-192-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typos in comments for jsGeorge Tsiolis2018-11-152-6/+6
* | | | | | | | | Merge branch '54046-fix-by-any-email-for-private-commit-emails' into 'master'Douwe Maan2018-11-193-10/+75
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Match users better by their private commit emailNick Thomas2018-11-193-10/+75
* | | | | | | | | | Merge branch 'if-ee-726-smartcard_auth-ce_port' into 'master'Douwe Maan2018-11-194-24/+44
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Backport of ee/8120: Smartcard authenticationif-ee-726-smartcard_auth-ce_portImre Farkas2018-11-184-24/+44
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'improve-variables-support' into 'master'Sean McGivern2018-11-195-183/+195
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve variables supportimprove-variables-supportKamil Trzciński2018-11-195-183/+195
* | | | | | | | | | | Add support for surfacing a link to the branch or tag name in push message…Tony Castrogiovanni2018-11-191-12/+53
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch '54093-the-default_value_for-gem-doesn-t-handle-actioncontroller...46166-add-constraints-that-prevent-ci_builds-from-being-associated-with-null-pipeline-projectSean McGivern2018-11-192-2/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add a test for the creation of an internal user by an admin54093-the-default_value_for-gem-doesn-t-handle-actioncontroller-parameters-correctlyRoger Rüttimann2018-11-151-1/+17
| * | | | | | | | | | Use gitlab-default_value_with Rails 5Rémy Coutable2018-11-151-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '52385-search-bar-for-dashboard-list' into 'master'Sean McGivern2018-11-1915-186/+102
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor whitelisting of filter paramsHeinrich Lee Yu2018-11-151-10/+5
| * | | | | | | | | | Add helper testsHeinrich Lee Yu2018-11-131-0/+35
| * | | | | | | | | | Change string concat to template stringHeinrich Lee Yu2018-11-131-2/+2
| * | | | | | | | | | Update documentationHeinrich Lee Yu2018-11-131-1/+1
| * | | | | | | | | | Fix testsHeinrich Lee Yu2018-11-1313-174/+60
* | | | | | | | | | | Merge branch 'sh-fix-issue-53783-ce' into 'master'Rémy Coutable2018-11-191-6/+143
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix enabling project deploy key for adminssh-fix-issue-53783-ceStan Hu2018-11-161-6/+143
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Don't show memory usage graph for unmerged MRsSimon Knox2018-11-191-2/+25
* | | | | | | | | | | Merge branch 'fix-not-render-emoji' into 'master'Mike Greiling2018-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix spec to catch not rendering emojiHiroyuki Sato2018-11-181-1/+1
* | | | | | | | | | | Merge branch '53700-hashed-storagemigration' into 'master'Stan Hu2018-11-161-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Allow partially migrated repositories to continue migration53700-hashed-storagemigrationGabriel Mazetto2018-11-151-0/+8
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'validate-that-foreign-keys-are-created' into 'master'Sean McGivern2018-11-161-0/+96
|\ \ \ \ \ \ \ \ \ \