summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bvl-fix-group-atom-feed' into 'master'Douwe Maan2017-10-221-0/+25
|\
| * Make sure we render events for projects within a groupBob Van Landuyt2017-10-201-0/+25
* | Fix the external URLs generated for online view of HTML artifactsNick Thomas2017-10-201-4/+3
* | Merge branch 'multi-file-editor-submodules' into 'master'Filipa Lacerda2017-10-203-2/+44
|\ \
| * | Added submodule support in multi-file editorPhil Hughes2017-10-203-2/+44
| |/
* | Use title as placeholder instead of issue title for reusabilityClement Ho2017-10-202-3/+3
* | Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann2017-10-202-1/+16
|\ \
| * | Fix failure in current_settings_spec.rbfix-application-setting-nil-cacheWinnie Hellmann2017-10-201-1/+1
| * | Prevent ApplicationSetting to cache nil valueKamil Trzcinski2017-10-191-0/+15
* | | Merge branch 'feature/reliable-rspec-with-eval-script' into 'master'Rémy Coutable2017-10-2011-1/+31
|\ \ \
| * | | Check for element before evaluate_scriptEric Eastwood2017-10-1911-1/+31
* | | | URI decode Page-Title header to preserve UTF-8 charactersToon Claes2017-10-201-0/+14
* | | | Force non diff resolved discussion to display when collapse toggledClement Ho2017-10-201-6/+23
* | | | Merge branch '37391-wiki-disk-path-helper' into 'master'Nick Thomas2017-10-201-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use wiki.disk_pathNick Thomas2017-10-181-1/+1
* | | | Merge branch '18765-stub_env_in_specs' into 'master'Robert Speicher2017-10-195-158/+131
|\ \ \ \
| * | | | Add a new RSpec::EnvAssignment cop to prevent assigning to ENV in specs18765-stub_env_in_specsRémy Coutable2017-10-181-0/+59
| * | | | Stub ENV in the LDAP task spec fileRémy Coutable2017-10-181-1/+1
| * | | | Stub ENV in the Gitaly task spec fileRémy Coutable2017-10-181-8/+1
| * | | | Stub ENV in the backup task spec fileRémy Coutable2017-10-182-149/+70
* | | | | Merge branch 'not-found-in-commits' into 'master'Douwe Maan2017-10-191-2/+29
|\ \ \ \ \
| * | | | | Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-181-2/+29
* | | | | | Merge branch 'encoding-helper-performance' into 'master'Rémy Coutable2017-10-191-2/+14
|\ \ \ \ \ \
| * | | | | | Avoind unnecesary `force_encoding` operationsAlejandro Rodríguez2017-10-181-2/+14
| | |/ / / / | |/| | | |
* | | | | | Remove dropzoneInput from global namespaceFilipa Lacerda2017-10-192-3/+1
|/ / / / /
* | | | | Prevent ApplicationHelper specs from polluting later ones39253-jobs-fail-because-of-brazilian-portuguese-translationsSean McGivern2017-10-181-3/+3
* | | | | Merge branch 'bvl-fix-locale-path' into 'master'Tim Zallmann2017-10-181-0/+8
|\ \ \ \ \
| * | | | | Build the locale path with an `_` instead of a `-`Bob Van Landuyt2017-10-181-0/+8
* | | | | | Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master'Tim Zallmann2017-10-181-20/+50
|\ \ \ \ \ \
| * | | | | | Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-componentEric Eastwood2017-10-171-20/+50
| | |_|_|_|/ | |/| | | |
* | | | | | Fix resolved discussions not expanding on side by side viewClement Ho2017-10-181-5/+24
| |_|_|/ / |/| | | |
* | | | | Fix PikadayFilipa Lacerda2017-10-181-0/+29
* | | | | Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master'Sean McGivern2017-10-181-24/+34
|\ \ \ \ \
| * | | | | Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitalyAhmad Sherif2017-10-161-24/+34
* | | | | | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-186-58/+99
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-1767-764/+3318
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-176-58/+99
* | | | | | | Merge branch '30140-restore-readme-only-preference' into 'master'Douwe Maan2017-10-182-6/+9
|\ \ \ \ \ \ \
| * | | | | | | Add readme only option as project viewAnnabel Dunstone Gray2017-10-162-6/+9
* | | | | | | | Merge branch '37032-get-project-branch-invalid-name-message' into 'master'Rémy Coutable2017-10-182-0/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Get Project Branch API shows an helpful error message on invalid refnameJacopo2017-10-182-0/+43
* | | | | | | | | Merge branch 'tc-saml-fix-false-empty' into 'master'Douwe Maan2017-10-184-21/+68
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix SAML error 500 when no groups are defined for usertc-saml-fix-false-emptyToon Claes2017-10-184-21/+68
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'Grzegorz Bizon2017-10-183-5/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix broken testkt/bug/fix-revision-and-size-for-container-registryFilipa Lacerda2017-10-171-2/+2
| * | | | | | | | Fix failed testKamil Trzcinski2017-10-171-2/+2
| * | | | | | | | Add short_revision and use total_sizeKamil Trzcinski2017-10-173-3/+8
* | | | | | | | | Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-1712-227/+164
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed Karam test because of event name changeph-multi-file-editor-restructure-dataPhil Hughes2017-10-171-2/+2
| * | | | | | | | | Fixed bug when clicking file link causing user to navigate awayPhil Hughes2017-10-172-2/+15
View Lorry Controller Status