summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into zj-kamil-slack-slash-commandszj-kamil-slack-slash-commands-2Kamil Trzcinski2016-12-1620-31/+230
|\
| * Merge branch 'dz-nested-groups-title-ui' into 'master' Sean McGivern2016-12-168-8/+50
| |\ | | | | | | | | | | | | UI improvements for nested group feature See merge request !8062
| | * Refactor Namespace#parents methoddz-nested-groups-title-uiDmitriy Zaporozhets2016-12-152-12/+8
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Add tests for Namespace#full_name methodDmitriy Zaporozhets2016-12-131-0/+8
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Use full_name for Group in UIDmitriy Zaporozhets2016-12-131-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Add parents method to NamespaceDmitriy Zaporozhets2016-12-132-5/+28
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Use full group name for admin group index and show pagesDmitriy Zaporozhets2016-12-132-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Show full path for nested groups at dashboard groups listDmitriy Zaporozhets2016-12-132-1/+9
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Show full path in header UI for nested groups/projectsDmitriy Zaporozhets2016-12-132-4/+11
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'fix-master-eslint-errors' into 'master' Douglas Barbosa Alexandre2016-12-164-10/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix eslint errors Fixes current eslint errors on master See merge request !8127
| | * | Fix eslint errorsfix-master-eslint-errorsAlfredo Sumaran2016-12-154-10/+10
| | | |
| * | | Merge branch 'fix/build' into 'master' Douglas Barbosa Alexandre2016-12-161-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix spec/features/admin/admin_active_tab_spec.rb See merge request !8130
| | * | | Fix spec/features/admin/admin_active_tab_spec.rbfix/buildDouglas Barbosa Alexandre2016-12-151-1/+1
| | | | |
| * | | | Merge branch 'katex-math-fixup' into 'master' Sean McGivern2016-12-161-4/+0
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Don't open Asciidoc module twice See merge request !8119
| | * | | Don't open Asciidoc module twiceMunken2016-12-151-4/+0
| | | | |
| * | | | Merge branch 'docs/add-okta-auth' into 'master' Achilleas Pipinellis2016-12-154-1/+162
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Add Okta authentication documentation Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/14122 See merge request !8104
| | * | | Add Okta authentication documentationdocs/add-okta-authAchilleas Pipinellis2016-12-154-1/+162
| | | | |
| * | | | Merge branch 'ha_docs_auto_migrate_false' into 'master' Achilleas Pipinellis2016-12-152-7/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `gitlab_rails['auto_migrate'] = false` to HA docs for Redis/PG [ci skip] ## What does this MR do? In a high availability configuration, the Redis and PostgreSQL nodes should not attempt to run database migrations. In fact, trying will result in errors about not providing a database password. To prevent errors and confusion, add this configurtion to these nodes' `gitlab.rb` file. See merge request !8112
| | * | | | Add `gitlab_rails['auto_migrate'] = false` to HA docs for Redis/PG [ci skip]Drew Blessing2016-12-152-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a high availability configuration, the Redis and PostgreSQL nodes should not attempt to run database migrations. In fact, trying will result in errors about not providing a database password. To prevent errors and confusion, add this configurtion to these nodes' `gitlab.rb` file.
* | | | | | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski2016-12-1612-58/+57
| | | | | |
* | | | | | Invalidate cache [ci skip]Kamil Trzcinski2016-12-160-0/+0
| | | | | |
* | | | | | Fix SlackSlashCommands testsKamil Trzcinski2016-12-168-118/+127
| | | | | |
* | | | | | Fix specsKamil Trzcinski2016-12-163-8/+12
| | | | | |
* | | | | | Merge branch 'issue_22269' into zj-kamil-slack-slash-commandsKamil Trzcinski2016-12-1638-132/+320
|\ \ \ \ \ \
| * | | | | | Fix rubocopKamil Trzcinski2016-12-161-1/+0
| | | | | | |
| * | | | | | Change SlackService to SlackNotificationsServiceissue_22269_fix_eeissue_22269Felipe Artur2016-12-1519-168/+223
| | | | | | |
| * | | | | | Mattermost Notifications ServiceFelipe Artur2016-12-1533-524/+658
| | | | | | |
* | | | | | | Render format dependent linksKamil Trzcinski2016-12-166-99/+132
| | | | | | |
* | | | | | | Use Slack compatible syntaxKamil Trzcinski2016-12-151-4/+4
| | | | | | |
* | | | | | | Use single presenter for everythingKamil Trzcinski2016-12-153-14/+2
| | | | | | |
* | | | | | | Rename Mattermost::Presenter to PresenterKamil Trzcinski2016-12-152-131/+133
| | | | | | |
* | | | | | | Rename ChatService into ChatSlashCommandsServiceKamil Trzcinski2016-12-155-81/+60
| | | | | | |
* | | | | | | Create Slack Slash command serviceZ.J. van de Weg2016-12-1517-50/+155
| |/ / / / / |/| | | | |
* | | | | | Merge branch ↵Kamil Trzciński2016-12-153-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentation' into 'master' Resolve "gitlab-ce mattermost slash command for issue create needs better documentation" ## What does this MR do? Updates the documentation and the <kbd>help</kbd> command to be clearer, having the keys used to add a newline in chat clients (both Mattermost and Slack). ## Are there points in the code the reviewer needs to double check? * Are the available commands (via <kbd>help</kbd>) being formatted as `<code>` ? ## Why was this MR needed? `\n` represents a new line character and doesn't communicate how the user should input the command. Also, to be correct, the documentation should use `<kbd>` instead of `<code>` for user input ([see HTML5 specification](https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element)) ## Screenshots (if relevant) | Mattermost | Docs | | --- | --- | | ![image](/uploads/539526a14bfd551b7e732dd96c5b7581/image.png) | ![image](/uploads/e3eb099f86c5a32ce3b8954e72c29848/image.png) | ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [ ] All builds are passing ## What are the relevant issue numbers? Closes #25144 See merge request !7850
| * | | | | | Rename `issue create` slash command to `issue new`25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentationPedro Moreira da Silva2016-12-152-2/+2
| | | | | | |
| * | | | | | Merge branch ↵Pedro Moreira da Silva2016-12-150-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentation' of gitlab.com:gitlab-org/gitlab-ce into 25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentation
| | * | | | | | Add changelog for !7850.Pedro Moreira da Silva2016-12-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7850
| | * | | | | | Update Mattermost slash commands docs to explain how to create a newline and ↵Pedro Moreira da Silva2016-11-301-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use <kbd> for user input. See HTML5 spec: https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element
| | * | | | | | Improve `issue create …` slash command with user input keys to create a ↵Pedro Moreira da Silva2016-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | newline in chat clients.
| * | | | | | | Add changelog for !7850.Pedro Moreira da Silva2016-12-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7850
| * | | | | | | Update Mattermost slash commands docs to explain how to create a newline and ↵Pedro Moreira da Silva2016-12-151-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use <kbd> for user input. See HTML5 spec: https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element
| * | | | | | | Improve `issue create …` slash command with user input keys to create a ↵Pedro Moreira da Silva2016-12-151-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | newline in chat clients.
* | | | | | | Merge branch '24877-bulk-edit-only-keeps-common-labels-when-searching' into ↵Fatih Acet2016-12-158-127/+199
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve bulk assignment This MR improves current implementation of Label dropdown when used for bulk assignment on issuable pages (/:namespace/:project/issues, /:namespace/:project/merge_requests) Previously this dropdown relied on `<input>` tags to get its active items and also to calculate items with indeterminate state. Relying on `<input>` tags is not enough when we want to set/get multiple states on a dropdown. For this case we want to get/set: - Marked items - Unmarked items that were initially marked - Unmarked items that were initially indeterminate - Items with indeterminate state. This MR makes the Label dropdown to save its own state as `data` so it will be easy to get and set whatever state we want no matter if the dropdown is filtering which is the issue that I initially wanted to solve as you can see in the following gif. **Before** ![2016-12-07_11.44.48](/uploads/cb697161b8b39cdee72fdbb95a531100/2016-12-07_11.44.48.gif) **After** ![2016-12-07_11.32.43](/uploads/338255a302de0dd1367474f33232d2a3/2016-12-07_11.32.43.gif) As you can see in the first gif the `bug` label is removed from the selected issues but the `enhancement` label should set but the `critical` should be kept. This is fixed on the next gif. Fixes #24877 See merge request !7765
| * | | | | | | Address feedback24877-bulk-edit-only-keeps-common-labels-when-searchingAlfredo Sumaran2016-12-144-17/+23
| | | | | | | |
| * | | | | | | Remove unwanted semicolonAlfredo Sumaran2016-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repeate after me: This is not JS
| * | | | | | | Add changelog fileAlfredo Sumaran2016-12-142-1/+5
| | | | | | | |
| * | | | | | | Improve issuable's bulk assignment implementationAlfredo Sumaran2016-12-147-123/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the case when the user wants to add a label. The user has to use the dropdown’s filter input to look for a label and click it in order to see the bug. Step to reproduce - Select at least two issues, one label should be present in all issues, other label should be present in at least one. - On the label dropdown: Deselect label that is present in all issues, look for another issue using the filter input and click it. - Click on `Update issues` Before: Unmarked label were kept on selected issues. Now: Unmarked label is removed from selected issues
* | | | | | | | Merge branch '25617-todos-filter-placeholder' into 'master' Annabel Dunstone Gray2016-12-152-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25617 Fix placeholder color of todo filters ## What does this MR do? Fixes color of placeholder text on todo filters ## Screenshots (if relevant) ![Screen_Shot_2016-12-14_at_1.42.02_PM](/uploads/7ceec3c8fff47825384835bcfb38d77c/Screen_Shot_2016-12-14_at_1.42.02_PM.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? Closes #25617 See merge request !8094
| * | | | | | | | 25617 Fix placeholder color of todo filters25617-todos-filter-placeholdertauriedavis2016-12-142-3/+7
| | | | | | | | |
* | | | | | | | | Merge branch '24824-dropdown-items-focus' into 'master' Annabel Dunstone Gray2016-12-152-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24824 Add focus state to dropdowns ## What does this MR do? Adds focus state to dropdown items to increase accessibility. ## Screenshots (if relevant) ![Screen_Shot_2016-12-01_at_2.47.13_PM](/uploads/d0d2c17dde61314c86155268815091f6/Screen_Shot_2016-12-01_at_2.47.13_PM.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? Closes #24824 See merge request !7885
View Lorry Controller Status