summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'improve_sorting_list' into 'master'Douwe Maan2017-09-257-117/+49
|\
| * Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-237-117/+49
* | Merge branch 'project-page-clearer' into 'master'Filipa Lacerda2017-09-253-4/+44
|\ \
| * | Fixes dashboard/projects empty state showing when viewing personal projectsPhil Hughes2017-09-221-4/+8
| * | Add context tabs to dashboard/projectsPhil Hughes2017-09-222-0/+36
* | | Merge branch 'fly-out-nav-mousepos-error' into 'master'Filipa Lacerda2017-09-251-0/+6
|\ \ \
| * | | Fixed fly-out error if mousePos array is emptyPhil Hughes2017-09-221-0/+6
* | | | Merge branch '38280-undefined-run_command-when-running-rake-gitlab-check' int...Douwe Maan2017-09-252-0/+37
|\ \ \ \
| * | | | Fixed few gitlab:check tasks that were failing with exception38280-undefined-run_command-when-running-rake-gitlab-checkGabriel Mazetto2017-09-252-0/+37
| | |_|/ | |/| |
* | | | Merge branch 'rs-allow-name-on-anchors' into 'master'Douwe Maan2017-09-251-2/+6
|\ \ \ \
| * | | | Make the "customizes the whitelist only once" spec less brittlers-allow-name-on-anchorsRobert Speicher2017-09-221-1/+3
| * | | | Re-allow `name` attribute on user-provided anchor HTMLRobert Speicher2017-09-221-1/+3
| | |/ / | |/| |
* | | | Merge branch 'rc/refactor-project_policy_spec-ce' into 'master'Douwe Maan2017-09-251-47/+86
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactor spec/policies/project_policy_spec.rb to minimize the diff with EErc/refactor-project_policy_spec-ceRémy Coutable2017-09-221-47/+86
* | | | Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master'Douwe Maan2017-09-224-12/+98
|\ \ \ \
| * | | | Allow the git circuit breaker to correctly handle missing repository storagesNick Thomas2017-09-224-12/+98
* | | | | Removed old icons from project pagePhil Hughes2017-09-221-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'replace_project_shortcuts.feature' into 'master'Rémy Coutable2017-09-223-21/+114
|\ \ \ \ | |_|_|/ |/| | |
| * | | Replace the 'project/shortcuts.feature' spinach test with an rspec analogreplace_project_shortcuts.featureVitaliy @blackst0ne Klachkov2017-09-223-21/+114
* | | | 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