summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clearly state "access control" from indexdocs-link-access-control-pagesMarcia Ramos2019-07-031-1/+1
|
* Merge branch 'do-not-save-peek-request-for-unauthenticated-users' into 'master'61056-data-improvements-for-contribution-analyticsSean McGivern2019-07-032-0/+15
|\ | | | | | | | | Only save Peek session in Redis when Peek is enabled See merge request gitlab-org/gitlab-ce!30306
| * Only save Peek session in Redis when Peek is enabledRémy Coutable2019-07-032-0/+15
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '61797-error-tracking-jest' into 'master'Kushal Pandya2019-07-038-7/+10
|\ \ | | | | | | | | | | | | | | | | | | Move error_tracking_frontend specs to Jest Closes #61797 See merge request gitlab-org/gitlab-ce!30211
| * | Move error_tracking_frontend specs to JestSimon Knox2019-07-038-7/+10
|/ / | | | | | | Update TEST_HOST import paths. Tests all pass
* | Merge branch '55487-enable-group-terminals-button' into 'master'Fatih Acet2019-07-033-37/+19
|\ \ | |/ |/| | | | | | | | | Enable terminals button for group clusters Closes #55487 See merge request gitlab-org/gitlab-ce!30255
| * Enable terminals button for group clusters55487-enable-group-terminals-buttonTiger2019-07-023-37/+19
| |
* | Merge branch 'winh-jest-markdown-header' into 'master'Paul Slaughter2019-07-032-9/+10
|\ \ | | | | | | | | | | | | Migrate markdown header_spec.js to Jest See merge request gitlab-org/gitlab-ce!30228
| * | Migrate markdown header_spec.js to JestWinnie Hellmann2019-07-032-9/+10
|/ /
* | Merge branch 'asciidoc-syntax-highlighting' into 'master'Douwe Maan2019-07-036-3/+91
|\ \ | | | | | | | | | | | | | | | | | | Enable AsciiDoc syntax highlighting (using Rouge) Closes #32635 See merge request gitlab-org/gitlab-ce!29835
| * | Enable AsciiDoc syntax highlighting (using Rouge)Guillaume Grossetie2019-07-026-3/+91
| | |
* | | Merge branch 'fix-todo-allow_collaboration' into 'master'Dmitriy Zaporozhets2019-07-031-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Update TODO: allow_collaboration column renaming See merge request gitlab-org/gitlab-ce!30291
| * | | Update TODO: allow_collaboration column renamingfix-todo-allow_collaborationMark Chao2019-07-031-0/+1
| | | |
* | | | Merge branch 'issue/55953' into 'master'Sean McGivern2019-07-0333-240/+247
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rename `discussion` to `thread` Closes #55953 See merge request gitlab-org/gitlab-ce!29553
| * | | | Update locale.potSean McGivern2019-07-031-9/+3
| | | | |
| * | | | Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953Sean McGivern2019-07-031083-24394/+6442
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/issue/55953' into issue/55953Michel Engelen2019-07-021-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # locale/gitlab.pot # spec/features/discussion_comments/commit_spec.rb
| | * | | | | updated localeMichel Engelen2019-07-021-6/+0
| | | | | | |
| | * | | | | replaced `discussion` with `thread` in comment buttonMichel Engelen2019-07-021-4/+4
| | | | | | |
| | * | | | | updated tests to comply with the corresponding EE branchMichel Engelen2019-06-265-9/+9
| | | | | | |
| | * | | | | updated localeMichel Engelen2019-06-141-9/+9
| | | | | | |
| | * | | | | prettified noteable_discussion spec fileMichel Engelen2019-06-141-6/+4
| | | | | | |
| | * | | | | fixed remaining specs for !29553Michel Engelen2019-06-142-3/+3
| | | | | | |
| | * | | | | prettified js testfile for noteable_discussion componentMichel Engelen2019-06-141-3/+3
| | | | | | |
| | * | | | | updated testMichel Engelen2019-06-141-8/+8
| | | | | | |
| | * | | | | updated karma test for noteable_discussion componentMichel Engelen2019-06-141-1/+1
| | | | | | |
| | * | | | | prettified noteable_discussion component and updated testsMichel Engelen2019-06-142-21/+19
| | | | | | |
| | * | | | | updated tests for !29553Michel Engelen2019-06-142-10/+10
| | | | | | |
| | * | | | | updated tests for !29553Michel Engelen2019-06-141-1/+1
| | | | | | |
| | * | | | | updated tests for !29553Michel Engelen2019-06-141-1/+1
| | | | | | |
| | * | | | | replaced string `discussion` with `thread` in issuable-form templateMichel Engelen2019-06-141-3/+3
| | | | | | |
| | * | | | | replaced string `discussion` wit `thread` in noteable-discussion componentMichel Engelen2019-06-141-6/+6
| | | | | | |
| | * | | | | replaced string `discussion` wit `thread` in comment-button templateMichel Engelen2019-06-141-2/+2
| | | | | | |
| | * | | | | replaced string `discussion` wit `thread` in discussion templateMichel Engelen2019-06-141-1/+1
| | | | | | |
| | * | | | | replaced string `discussion` wit `thread` in note-form componentMichel Engelen2019-06-141-2/+2
| | | | | | |
| | * | | | | updated Karma test for changed strings in mr-widget stateMichel Engelen2019-06-131-4/+4
| | | | | | |
| | * | | | | updated localizationMichel Engelen2019-06-131-4/+4
| | | | | | |
| | * | | | | replaced string `discussion` with string `thread` in mr-widget component stateMichel Engelen2019-06-131-1/+1
| | | | | | |
| | * | | | | updated tests for !29553Michel Engelen2019-06-131-2/+2
| | | | | | |
| | * | | | | updated tests for !29553Michel Engelen2019-06-131-85/+85
| | | | | | |
| | * | | | | replaced string `discussion` with string `thread` in thread headerMichel Engelen2019-06-132-2/+2
| | | | | | |
| | * | | | | updated tests for !29553Michel Engelen2019-06-131-16/+16
| | | | | | |
| | * | | | | updated tests for !29553Michel Engelen2019-06-131-18/+18
| | | | | | |
| | * | | | | updated locale strings for !29553Michel Engelen2019-06-121-7/+19
| | | | | | |
| | * | | | | updated tests for !29553Michel Engelen2019-06-121-1/+1
| | | | | | |
| | * | | | | updated tests for !29553Michel Engelen2019-06-121-2/+2
| | | | | | |
| | * | | | | updated tests for change in !29553Michel Engelen2019-06-121-3/+3
| | | | | | |
| | * | | | | renamed `discussion` to `thread` in popover from reply form buttonMichel Engelen2019-06-122-3/+3
| | | | | | |
| | * | | | | added changelog entry for !29553Michel Engelen2019-06-121-0/+5
| | | | | | |
| | * | | | | changed string `discussion` to `thread` in timeline update ("[user] resolved ↵Michel Engelen2019-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | all threads")
View Lorry Controller Status