summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '37860-pipelines-page' into 'master'Phil Hughes2017-10-235-9/+20
|\
| * Changes after review37860-pipelines-pageFilipa Lacerda2017-10-232-0/+4
| * Merge branch 'master' into 37860-pipelines-pageFilipa Lacerda2017-10-2334-189/+340
| |\
| * | Fix failing testsFilipa Lacerda2017-10-192-2/+0
| * | Make pipelines table in MR view usableFilipa Lacerda2017-10-181-7/+16
* | | Merge branch '35644-refactor-have-http-status-into-have-gitlab-http-status' i...Rémy Coutable2017-10-23178-2658/+2658
|\ \ \
| * | | Refactor `have_http_status` into `have_gitlab_http_status` in the specsJacopo2017-10-20178-2658/+2658
* | | | Merge branch 'backort_routes_group_routes_from_ee' into 'master'Douwe Maan2017-10-231-9/+3
|\ \ \ \
| * | | | Backport EE changes to group routesbackort_routes_group_routes_from_eeValery Sizov2017-10-221-9/+3
* | | | | Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'Douwe Maan2017-10-231-1/+0
|\ \ \ \ \
| * | | | | Only cache the event for the fork-source when it existsbvl-fix-push-event-service-for-forksBob Van Landuyt2017-10-221-1/+0
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-escaped-text-replacement' into 'master'Filipa Lacerda2017-10-231-0/+10
|\ \ \ \ \
| * | | | | notes.js: use the original content when resetting the formBen Boeckel2017-10-191-0/+10
| |/ / / /
* | | | | Create new branch from dropdown.Jacob Schatz2017-10-233-0/+253
* | | | | Merge branch 'add-shared-vue-loading-button' into 'master'Filipa Lacerda2017-10-231-0/+93
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add loading buttonadd-shared-vue-loading-buttonEric Eastwood2017-10-231-0/+93
* | | | | Merge branch '38869-diff' into 'master'Phil Hughes2017-10-231-3/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove Diff class from globalnamespaceFilipa Lacerda2017-10-191-3/+2
* | | | | 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