summaryrefslogtreecommitdiff
Commit message (Expand)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
| |\
| | * Refactor Namespace#parents methoddz-nested-groups-title-uiDmitriy Zaporozhets2016-12-152-12/+8
| | * Add tests for Namespace#full_name methodDmitriy Zaporozhets2016-12-131-0/+8
| | * Use full_name for Group in UIDmitriy Zaporozhets2016-12-131-1/+1
| | * Add parents method to NamespaceDmitriy Zaporozhets2016-12-132-5/+28
| | * Use full group name for admin group index and show pagesDmitriy Zaporozhets2016-12-132-2/+2
| | * Show full path for nested groups at dashboard groups listDmitriy Zaporozhets2016-12-132-1/+9
| | * Show full path in header UI for nested groups/projectsDmitriy Zaporozhets2016-12-132-4/+11
| * | Merge branch 'fix-master-eslint-errors' into 'master' Douglas Barbosa Alexandre2016-12-164-10/+10
| |\ \
| | * | 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.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 twiceMunken2016-12-151-4/+0
| * | | | Merge branch 'docs/add-okta-auth' into 'master' Achilleas Pipinellis2016-12-154-1/+162
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | 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]Drew Blessing2016-12-152-7/+7
* | | | | | 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 '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs...Kamil Trzciński2016-12-153-12/+12
|\ \ \ \ \ \
| * | | | | | 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 '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs...Pedro Moreira da Silva2016-12-150-0/+0
| |\ \ \ \ \ \
| | * | | | | | Add changelog for !7850.Pedro Moreira da Silva2016-12-071-0/+4
| | * | | | | | Update Mattermost slash commands docs to explain how to create a newline and ...Pedro Moreira da Silva2016-11-301-11/+7
| | * | | | | | Improve `issue create …` slash command with user input keys to create a new...Pedro Moreira da Silva2016-11-301-1/+1
| * | | | | | | Add changelog for !7850.Pedro Moreira da Silva2016-12-151-0/+4
| * | | | | | | Update Mattermost slash commands docs to explain how to create a newline and ...Pedro Moreira da Silva2016-12-151-11/+7
| * | | | | | | Improve `issue create …` slash command with user input keys to create a new...Pedro Moreira da Silva2016-12-151-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '24877-bulk-edit-only-keeps-common-labels-when-searching' into '...Fatih Acet2016-12-158-127/+199
|\ \ \ \ \ \ \
| * | | | | | | Address feedback24877-bulk-edit-only-keeps-common-labels-when-searchingAlfredo Sumaran2016-12-144-17/+23
| * | | | | | | Remove unwanted semicolonAlfredo Sumaran2016-12-141-1/+1
| * | | | | | | Add changelog fileAlfredo Sumaran2016-12-142-1/+5
| * | | | | | | Improve issuable's bulk assignment implementationAlfredo Sumaran2016-12-147-123/+185
* | | | | | | | Merge branch '25617-todos-filter-placeholder' into 'master' Annabel Dunstone Gray2016-12-152-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status