summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix tests because now we don't convert valuesfix-yaml-variablesLin Jen-Shin2016-12-191-2/+2
|
* Spaces for literal hashLin Jen-Shin2016-12-191-1/+1
|
* Keep the value type for YAML variablesLin Jen-Shin2016-12-192-2/+1
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8088#note_20235080
* Test if expanded_environment_name could expand varLin Jen-Shin2016-12-191-2/+16
| | | | | with symbols. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8088#note_20234245
* Just implement it in the blockLin Jen-Shin2016-12-191-9/+5
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8088#note_20223109
* Merge branch 'master' into fix-yaml-variablesLin Jen-Shin2016-12-19735-2798/+17939
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (327 commits) Always use `fixture_file_upload` helper to upload files in tests. Add CHANGELOG Move admin application spinach test to rspec Move admin deploy keys spinach test to rspec Fix rubocop failures Store mattermost_url in settings Improve Mattermost Session specs Ensure the session is destroyed Improve session tests Setup mattermost session Fix query in Projects::ProjectMembersController to fetch members Improve test for sort dropdown on members page Fix sort dropdown alignment Undo changes on members search button stylesheet Use factories to create project/group membership on specs Remove unused id from shared members sort dropdown Fix sort functionality on project/group members to return invited users Refactor MembersHelper#filter_group_project_member_path Remove unnecessary curly braces from sort dropdown partial Sort group/project members alphabetically by default ...
| * Merge branch 'dockerfile-templates' into 'master' Rémy Coutable2016-12-1912-6/+138
| |\ | | | | | | | | | | | | Allow to use Dockerfile templates See merge request !7247
| | * Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-182868-35378/+79204
| | |\
| | * | Add CHANGELOGKamil Trzcinski2016-12-181-0/+4
| | | |
| | * | Update templates.rbKamil Trzciński2016-12-161-1/+1
| | | |
| | * | Refactored JSLuke "Jared" Bennett2016-11-087-42/+84
| | | | | | | | | | | | | | | | Added spec
| | * | Allow to use Dockerfile templatesKamil Trzcinski2016-11-089-7/+93
| | | |
| * | | Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-194-77/+36
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin application spinach test to RSpec Part of #23036 See merge request !8140
| | * | | Move admin application spinach test to rspecSemyon Pupkov2016-12-174-77/+36
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
| * | | | Merge branch 'deploy-keys-to-rspec' into 'master' Rémy Coutable2016-12-193-62/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin deploy keys spinach test to RSpec Part of #23036 See merge request !8141
| | * | | | Move admin deploy keys spinach test to rspecSemyon Pupkov2016-12-173-62/+29
| | |/ / / | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
| * | | | Merge branch 'fix-groups-helper-spec' into 'master' Stan Hu2016-12-191-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use `fixture_file_upload` helper to upload files in tests. ## What does this MR do? Fix a broken spec. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !8164
| | * | | | Always use `fixture_file_upload` helper to upload files in tests.fix-groups-helper-specRuben Davila2016-12-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | * Also is not a good idea to use File.open without closing the file handler. We should use it with a block or close it explicitly.
| * | | | Merge branch 'update-nginx-config-for-websockets' into 'master' Kamil Trzciński2016-12-182-0/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update NGINX configuration files to add websocket support ## What does this MR do? Changes the bundled NGINX configuration files to support websockets introduced in https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/83 These changes are also going into omnibus: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1146 ## Are there points in the code the reviewer needs to double check? Best to wait until the omnibus MR is merged as the method may be changed. ## Why was this MR needed? Without it, NGINX won't let websockets through to workhorse. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Related to #22864 See merge request !8039
| | * | | | Upgrade NGINX configuration files to add websocket supportNick Thomas2016-12-122-0/+15
| | | | | |
| * | | | | Merge branch 'correct-slack-slash-commands-pretty-path' into 'master' Kamil Trzciński2016-12-181-3/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct mattermost slash commands pretty path ## What does this MR do? Corrects the pretty path used for mattermost slash commands. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-12-14_at_13.31.18](/uploads/61b0cbe11bf747d566ed7959efa704b8/Screen_Shot_2016-12-14_at_13.31.18.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !8085
| | * | | | | Correct slack slash commands pretty pathcorrect-slack-slash-commands-pretty-pathLuke "Jared" Bennett2016-12-151-3/+2
| | | | | | |
| * | | | | | Merge branch 'feature/runner-script-attempts-docs' into 'master' Kamil Trzciński2016-12-183-0/+29
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new runner script attempts docs and update .gitlab-ci.yml Related: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1907 and https://gitlab.com/gitlab-com/infrastructure/issues/685 Adds missing docs about the new script attempts variables in the runner. See merge request !8100
| | * | | | | Add detailed docs in yaml README [ci skip]feature/runner-script-attempts-docsJames Lopez2016-12-161-0/+25
| | | | | | |
| | * | | | | add new runner script attempts docs and update .gitlab-ci.ymlJames Lopez2016-12-152-0/+4
| | | | | | |
| * | | | | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' ↵Sean McGivern2016-12-1721-44/+45
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Enable Style/MultilineOperationIndentation in Rubocop Fixes #25741 See merge request !8125
| | * | | | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-1621-44/+45
| | | | | | |
| * | | | | | Merge branch 'zj-mattermost-session' into 'master' Grzegorz Bizon2016-12-174-0/+227
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mattermost session This branch is based of tag v8.14.4 so I could test on an instance better. But stuck on the tests, as setting up the whole doorkeeper stuff doesn't seem to be supported for testing. See merge request !8033
| | * | | | | | Fix rubocop failureszj-mattermost-sessionKamil Trzcinski2016-12-172-17/+23
| | | | | | | |
| | * | | | | | Store mattermost_url in settingsKamil Trzcinski2016-12-174-13/+35
| | | | | | | |
| | * | | | | | Improve Mattermost Session specsKamil Trzcinski2016-12-172-26/+50
| | | | | | | |
| | * | | | | | Ensure the session is destroyedZ.J. van de Weg2016-12-171-3/+5
| | | | | | | |
| | * | | | | | Improve session testsZ.J. van de Weg2016-12-173-45/+74
| | | | | | | |
| | * | | | | | Setup mattermost sessionZ.J. van de Weg2016-12-172-0/+144
| |/ / / / / /
| * | | | | | Merge branch 'cleaner-merge-commit-messages' into 'master' Sean McGivern2016-12-179-21/+242
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaner merge commit messages Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23462 See merge request !7722
| | * | | | | | Change closes issues reference text on MergeRequest#merge_commit_message to ↵Gabriel Gizotti2016-12-163-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match existing text generated by the system
| | * | | | | | add feature specs to test toggling of merge commit message between message ↵Gabriel Gizotti2016-12-162-3/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with description and without
| | * | | | | | add eslint disable prefix for prefer-arrow-callback rule on header of ↵Gabriel Gizotti2016-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_request.js file
| | * | | | | | Add feature spec to verify all 4 different states of closing issues message ↵Gabriel Gizotti2016-12-161-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Merge Request show page.
| | * | | | | | add guard clause to MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-9/+6
| | | | | | | |
| | * | | | | | add js prefix to classes used to toggle description on commit message in ↵Gabriel Gizotti2016-12-162-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge request
| | * | | | | | Show either description or closes issues references on ↵Gabriel Gizotti2016-12-163-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequest#merge_commit_message so closes issues references are not duplicated
| | * | | | | | Unify commit message listeners in one functionGabriel Gizotti2016-12-161-11/+6
| | | | | | | |
| | * | | | | | better text for mentioned but not closedGabriel Gizotti2016-12-161-1/+1
| | | | | | | |
| | * | | | | | add mentioned but not closed message to the same line as closes issueswqGabriel Gizotti2016-12-161-13/+14
| | | | | | | |
| | * | | | | | extract duplicate logic into a variable on _commit_message_containerGabriel Gizotti2016-12-161-2/+3
| | | | | | | |
| | * | | | | | Better `Closes issues` text for MergeRequest#merge_commit_messageGabriel Gizotti2016-12-161-1/+2
| | | | | | | |
| | * | | | | | move javascript code from _commit_message_container view to ↵Gabriel Gizotti2016-12-162-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | javascripts/merge_request.js
| | * | | | | | backend completely drives creation of merge commit messageGabriel Gizotti2016-12-165-26/+37
| | | | | | | |
| | * | | | | | Remove unnecessary code from MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-4/+2
| | | | | | | |
View Lorry Controller Status