summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* implement basic request inspector for use in Capybara testsMike Greiling2017-10-232-0/+60
|
* Changed trigger click calls to click()Jose Ivan Vargas2017-10-233-5/+7
|
* add accept_confirm to specJose Ivan Vargas2017-10-231-1/+1
|
* Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-23673-6393/+18722
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (297 commits) Fix deletion of container registry or images returning an error The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix: Decrease ABC threshold to 54.28 Update VERSION to 10.2.0-pre Update CHANGELOG.md for 10.1.0 Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` Fix the external URLs generated for online view of HTML artifacts Use title as placeholder instead of issue title for reusability Fix failure in current_settings_spec.rb Clarify the difference between project_update and project_rename URI decode Page-Title header to preserve UTF-8 characters Update Gitaly version to v0.49.0 Decrease Perceived Complexity threshold to 14 Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)" Force non diff resolved discussion to display when collapse toggled Added submodule support in multi-file editor add note about after_script being run separately Check for element before evaluate_script Merge branch 'master-i18n' into 'master' Update Prometheus gem to fix problems with other files overwriting current file ...
| * Merge branch '39308-fix-broken-master' into 'master'Sean McGivern2017-10-231-1/+2
| |\ | | | | | | | | | | | | | | | | | | Fix the broken .tests-metadata-state definition Closes #39308 See merge request gitlab-org/gitlab-ce!14969
| | * Fix the broken .tests-metadata-state definitionRémy Coutable2017-10-201-1/+2
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Merge branch 'sh-fix-container-registry-destroy' into 'master'Filipa Lacerda2017-10-232-4/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix deletion of container registry or images returning an error Closes #39354 See merge request gitlab-org/gitlab-ce!14992
| | * | Fix deletion of container registry or images returning an errorStan Hu2017-10-232-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A successful DELETE call would result in a 204 No Content result, which would have an empty response body. Don't automatically try to parse this value as JSON both because there is no additional information passed in the response body. Closes #39354
| * | | Merge branch 'fix-fog-aliyun-39126' into 'master'Stan Hu2017-10-232-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This… Closes #39126 See merge request gitlab-org/gitlab-ce!14991
| | * | | The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. ↵Paul B2017-10-232-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge requests update the gem to v0.2.0 which contains the fix: https://github.com/fog/fog-aliyun/commit/a7456ca6b63e5a0d88c849914679d2fa4707c10c Closes #39126
| * | | Merge branch '28202_decrease_abc_threshold_step5' into 'master'Robert Speicher2017-10-223-5/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Decrease ABC threshold to 54.28 See merge request gitlab-org/gitlab-ce!14920
| | * | | Decrease ABC threshold to 54.28Maxim Rydkin2017-10-223-5/+12
| |/ / /
| * | | Merge branch 'bvl-fix-group-atom-feed' into 'master'Douwe Maan2017-10-223-0/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we render events for projects within a group Closes #39305 See merge request gitlab-org/gitlab-ce!14974
| | * | | Make sure we render events for projects within a groupBob Van Landuyt2017-10-203-0/+41
| | | | |
| * | | | Update VERSION to 10.2.0-prev10.2.0.preStan Hu2017-10-211-1/+1
| | | | |
| * | | | Update CHANGELOG.md for 10.1.0Stan Hu2017-10-21187-932/+192
| | | | | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2017-10-210-0/+0
| |\ \ \ \
| | * | | | Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`Alessio Caiazza2017-10-211-0/+2
| | | | | |
| | * | | | Fix the external URLs generated for online view of HTML artifactsNick Thomas2017-10-213-10/+19
| | | | | |
| | * | | | Use title as placeholder instead of issue title for reusabilityClement Ho2017-10-214-7/+12
| | | | | |
| | * | | | Fix failure in current_settings_spec.rbWinnie Hellmann2017-10-211-1/+1
| | | | | |
| | * | | | Clarify the difference between project_update and project_renameJoe Marty2017-10-212-0/+7
| | | | | |
| | * | | | URI decode Page-Title header to preserve UTF-8 charactersToon Claes2017-10-213-2/+16
| | | | | |
| | * | | | Update Gitaly version to v0.49.0Andrew Newdigate2017-10-211-1/+1
| | | | | |
| | * | | | Decrease Perceived Complexity threshold to 14Maxim Rydkin2017-10-213-9/+27
| | | | | |
| | * | | | Resolve "Remove help text regarding group issues on group issues page (and ↵Victor Wu2017-10-213-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | group merge requests page)"
| | * | | | Force non diff resolved discussion to display when collapse toggledClement Ho2017-10-213-7/+29
| | | | | |
| | * | | | Added submodule support in multi-file editorPhil Hughes2017-10-218-5/+75
| | | | | |
| | * | | | add note about after_script being run separatelyMartin Nowak2017-10-211-0/+6
| | | | | |
| | * | | | Check for element before evaluate_scriptEric Eastwood2017-10-2115-20/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tip from https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara#directly-interacting-with-javascript
| | * | | | Merge branch 'master-i18n' into 'master'Douwe Maan2017-10-2115-1147/+8176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!3030
| | * | | | Update Prometheus gem to fix problems with other files overwriting current filePawel Chojnacki2017-10-212-3/+3
| | | | | |
| | * | | | Prevent ApplicationSetting to cache nil valueKamil Trzcinski2017-10-213-1/+24
| | | | | |
| | * | | | Remove dropzoneInput from global namespaceFilipa Lacerda2017-10-217-309/+269
| | | | | |
| | * | | | Add docs for `api_json.log` fileStan Hu2017-10-211-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | Fix broken function invocationFilipa Lacerda2017-10-212-2/+2
| | | | | |
| | * | | | Fix inability to delete container registry tagsStan Hu2017-10-212-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because container registry tags can have periods, the addition of the `.json` format caused ambiguity. Since the tag name regex is greedy, it would attempt to locate an image named `foo.json` instead of `foo`. Closes #39260
| | * | | | Document converting `+` to `%2B` in an API query parameterStan Hu2017-10-211-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-214-3/+37
| | | | | |
| | * | | | Avoind unnecesary `force_encoding` operationsAlejandro Rodríguez2017-10-212-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're costly. This will also avoid some edge cases where charlock_holmes assigns a weird encoding to a perfectly valid UTF-8 string.
| | * | | | Add members flyout on collapsed sidebarAnnabel Dunstone Gray2017-10-211-0/+5
| | | | | |
| | * | | | Update GraphQL licensing situation in the docsNick Thomas2017-10-212-1/+17
| | | | | |
| | * | | | Improve the build-package and .review-docs jobsRémy Coutable2017-10-211-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodesRémy Coutable2017-10-211-63/+63
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Improve the .tests-metadata-state definition a bitRémy Coutable2017-10-211-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Add a new RSpec::EnvAssignment cop to prevent assigning to ENV in specsRémy Coutable2017-10-214-5/+135
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Stub ENV in the LDAP task spec fileRémy Coutable2017-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Stub ENV in the Gitaly task spec fileRémy Coutable2017-10-211-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Stub ENV in the backup task spec fileRémy Coutable2017-10-213-188/+109
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Animate auto devops graphicClement Ho2017-10-213-2/+18
| | | | | |
View Lorry Controller Status