summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '33328-usage-ping-for-gitlab-features-and-components' into 'master'Rémy Coutable2017-09-221-0/+36
|\
| * Adds gitlab features and components to usage ping data.33328-usage-ping-for-gitlab-features-and-componentsTiago Botelho2017-09-211-0/+36
* | Merge branch 'sh-blob-raw-check' into 'master'Douwe Maan2017-09-221-0/+3
|\ \
| * | Ensure that Blob.raw returns always returns a valid blob objectsh-blob-raw-checkStan Hu2017-09-211-0/+3
| |/
* | Merge branch 'backport-ee-2983' into 'master'Rémy Coutable2017-09-221-6/+1
|\ \
| * | Simplify a testNick Thomas2017-09-211-6/+1
| |/
* | Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-227-1/+69
* | Merge branch 'add-view-replaced-file-link' into 'master'Rémy Coutable2017-09-221-5/+35
|\ \
| * | Add view replaced file link for image diffsadd-view-replaced-file-linkClement Ho2017-09-201-5/+35
* | | Merge branch 'replace_project_service.feature' into 'master'Rémy Coutable2017-09-2216-27/+342
|\ \ \
| * | | Replace the 'project/service.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-2216-27/+342
* | | | Merge branch 'fix-multi-line-hook-output' into 'master'Rémy Coutable2017-09-221-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Display full pre-receive and post-receive hook output in GitLab UIRobin Bobbitt2017-09-211-1/+2
| | |/ | |/|
* | | Fix rendering double note issue.Fatih Acet2017-09-222-10/+21
* | | Merge branch 'acet-fix-comment-form-resize' into 'master'Jacob Schatz2017-09-211-0/+14
|\ \ \
| * | | IssueNotes: Resize comment form after note submit and discard.acet-fix-comment-form-resizeFatih Acet2017-09-211-0/+14
* | | | Standardize access to CSRF token in JavaScriptBryce Johnson2017-09-211-0/+49
* | | | Merge branch 'dm-closing-issue-urls' into 'master'Robert Speicher2017-09-211-2/+2
|\ \ \ \
| * | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptionsdm-closing-issue-urlsDouwe Maan2017-09-211-2/+2
| | |/ / | |/| |
* | | | Adds EE tag detection to remove_old in gitlab backup.Tiago Botelho2017-09-211-5/+11
|/ / /
* | | Merge branch '37220-es-modules' into 'master'Phil Hughes2017-09-215-336/+363
|\ \ \
| * \ \ Merge branch 'master' into 37220-es-modulesMike Greiling2017-09-18112-2246/+3943
| |\ \ \
| * | | | fixed mr widget options specPhil Hughes2017-09-131-3/+2
| * | | | fixed todos specPhil Hughes2017-09-121-17/+9
| * | | | Merge branch 'master' into 37220-es-modulesFilipa Lacerda2017-09-1223-265/+982
| |\ \ \ \
| * | | | | fixed location.pathname not being resetPhil Hughes2017-09-121-1/+1
| * | | | | Import modules instead of using the ones in global namespaceFilipa Lacerda2017-09-095-85/+123
| * | | | | Use modules in common utilsFilipa Lacerda2017-09-091-309/+307
* | | | | | Merge branch '38088-remove-banner-to-customize-experience' into 'master'Douwe Maan2017-09-213-139/+0
|\ \ \ \ \ \
| * | | | | | Deleted another Fixture due to User Callout38088-remove-banner-to-customize-experienceTim Zallmann2017-09-201-30/+0
| * | | | | | Fixture Creation removedTim Zallmann2017-09-201-5/+0
| * | | | | | Deleted Karma Specs for userCalloutTim Zallmann2017-09-201-49/+0
| * | | | | | Removed User Callout for Customer ExperienceTim Zallmann2017-09-201-55/+0
* | | | | | | Merge branch 'remove-use-key-worker' into 'master'Rémy Coutable2017-09-213-45/+77
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Stop using Sidekiq for updating Key#last_used_atremove-use-key-workerYorick Peterse2017-09-203-45/+77
* | | | | | | Merge branch 'gitlab-git-popen' into 'master'Douwe Maan2017-09-203-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Use Gitlab::Git's Popen on that module's codegitlab-git-popenAlejandro Rodríguez2017-09-203-5/+5
* | | | | | | | Merge branch '32796-tighten-up-remove-old-while-backing-up-gitlab' into 'master'Rémy Coutable2017-09-201-9/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Tighten up remove_old regex from gitlab backup manager.32796-tighten-up-remove-old-while-backing-up-gitlabTiago Botelho2017-09-201-9/+37
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-counts-caching' into 'master'Douwe Maan2017-09-206-6/+13
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix refreshing of issues/MR count cachesfix-counts-cachingYorick Peterse2017-09-196-6/+13
* | | | | | | | Fix rewriting issue references with group milestonesGrzegorz Bizon2017-09-204-21/+61
* | | | | | | | Merge branch '20049-projects-api-forks' into 'master'Rémy Coutable2017-09-202-0/+96
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add an API endpoint to determine the forks of a projectMark Fletcher2017-09-201-0/+53
| * | | | | | | Introduce ForkProjectsFinder classMark Fletcher2017-09-201-0/+43
* | | | | | | | Merge branch 'rc/use-set-in-api-specs' into 'master'Grzegorz Bizon2017-09-2011-81/+87
|\ \ \ \ \ \ \ \
| * | | | | | | | Use set in some API specsrc/use-set-in-api-specsRémy Coutable2017-09-1911-81/+87
* | | | | | | | | Merge branch 'fix/gitaly-commit-diff-rpc-encoding-error' into 'master'Robert Speicher2017-09-201-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Encode paths properly for Gitaly Commit{Diff,Delta}fix/gitaly-commit-diff-rpc-encoding-errorAhmad Sherif2017-09-191-0/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '37894-handle-if-auto-devops-domain-is-not-set' into 'master'Stan Hu2017-09-192-1/+77
|\ \ \ \ \ \ \ \