summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-041-0/+64
|\
| * fix specJames Lopez2016-08-041-1/+1
| * using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-041-0/+64
* | Merge branch 'devise-deprecations' into 'master' Rémy Coutable2016-08-042-2/+2
|\ \
| * | Remove provider path, replace with dynamic path.devise-deprecationsConnor Shea2016-08-032-2/+2
* | | Merge branch 'fix/import-error' into 'master' Rémy Coutable2016-08-041-0/+30
|\ \ \
| * | | Fix Import/Export error checking versionsfix/import-errorJames Lopez2016-08-031-0/+30
* | | | Merge branch 'fix-project-destroy-skip-repo' into 'master' Robert Speicher2016-08-041-0/+24
|\ \ \ \
| * | | | Fix skip_repo parameter being ignored when destroying a namespaceStan Hu2016-08-031-0/+24
* | | | | change the API on the merge_request_diff model from diffs -> raw_diffsuse-raw-diffs-for-merge-request-diffsPaco Guzman2016-08-032-8/+8
|/ / / /
* | | | Make Compare#diffs diff_options a regular argumentDouwe Maan2016-08-031-1/+1
* | | | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-0312-25/+129
* | | | Introduce Compare model in the codebase.Paco Guzman2016-08-033-12/+17
* | | | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-036-19/+44
* | | | Cache highlighted diff lines for merge requestsPaco Guzman2016-08-033-22/+23
|/ / /
* | | Merge branch '18866-add-simple-identifier-to-public-ssh-keys' into 'master' Douwe Maan2016-08-022-3/+4
|\ \ \
| * | | Tidy the key spec and fix failing user specKeith Pope2016-08-022-2/+2
| * | | Add simple identifier to public SSH keysKeith Pope2016-08-021-2/+3
* | | | Merge branch 'rs-external-issue-tracker-redirect' into 'master' Douwe Maan2016-08-022-113/+49
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove `url_for_new_issue` helperrs-external-issue-tracker-redirectRobert Speicher2016-08-012-46/+14
| * | | Redirect to external issue tracker from `/issues`Robert Speicher2016-08-012-68/+36
* | | | Merge branch 'branches-ending-with-json' into 'master' Douwe Maan2016-08-024-2/+47
|\ \ \ \
| * | | | Add failing test for #20462winniehell2016-08-024-2/+47
| |/ / /
* | | | Expand commit message width in repo viewClement Ho2016-08-021-0/+21
* | | | Merge branch '14202-speed-up-diff-note-active' into 'master' Yorick Peterse2016-08-022-2/+26
|\ \ \ \
| * | | | Speedup DiffNote#active? on discussions, preloading noteables and avoid touch...Paco Guzman2016-08-022-2/+26
* | | | | Merge branch 'es6-specs-pls' into 'master' Fatih Acet2016-08-021-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removed coffee matcherses6-specs-plsLuke Bennett2016-07-291-1/+1
| * | | | Added es6 regex to teaspoon matchers, still doesnt fix it, problem with sproc...Luke Bennett2016-07-291-1/+1
* | | | | Merge branch 'handle-disabled-request-store' into 'master' Yorick Peterse2016-08-021-40/+61
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Only use RequestStore in ProjectTeam#max_member_access_for_user if it is activeStan Hu2016-08-011-40/+61
* | | | | Add failing tests for #19028winniehell2016-08-021-0/+12
| |_|/ / |/| | |
* | | | Merge branch 'oldrev-in-update-hooks' into 'master' Douwe Maan2016-08-011-3/+3
|\ \ \ \
| * | | | webhooks: include old revision in MR update eventsBen Boeckel2016-08-011-3/+3
* | | | | Fix search results for notes without commitsFelipe Artur2016-08-011-0/+20
|/ / / /
* | | | Merge branch 'fix-gh-pull-requests' into 'master' Rémy Coutable2016-08-011-3/+15
|\ \ \ \
| * | | | Fix attr reader to force the intended values for source and target shasDouglas Barbosa Alexandre2016-07-311-3/+15
| | |_|/ | |/| |
* | | | Merge branch 'fix-extra-new-line-crlf' into 'master' Rémy Coutable2016-08-013-2/+15
|\ \ \ \
| * | | | Fix specsfix-extra-new-line-crlfRémy Coutable2016-08-012-2/+2
| * | | | Trim extra displayed carriage returns in diffs and files with CRLFsStan Hu2016-08-012-1/+14
* | | | | Merge branch '15064_issuable_default_sort_order' into 'master' Rémy Coutable2016-08-015-35/+216
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | State specific default sort order for issuableszs2016-08-015-35/+216
* | | | | Merge branch 'fix/labels-milestones-import' into 'master' Rémy Coutable2016-08-013-141/+77
|\ \ \ \ \
| * | | | | squashed - fixed label and milestone association problems, updated specs and ...fix/labels-milestones-importJames Lopez2016-08-013-141/+77
| | |_|/ / | |/| | |
* | | | | Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-015-2/+209
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Minor fixes in the Env API endpointszj-env-external-urlZ.J. van de Weg2016-08-011-2/+18
| * | | | Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-292-23/+35
| * | | | Incorporate feedbackZ.J. van de Weg2016-07-293-16/+31
| * | | | Add API support for environmentsZ.J. van de Weg2016-07-291-0/+103
| * | | | Add an URL field to EnvironmentsZ.J. van de Weg2016-07-294-2/+63
| |/ / /
View Lorry Controller Status