summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make sure TraceReader uses Encoding.default_externalfix-trace-reader-encodingLin Jen-Shin2017-01-262-2/+15
| | | | | | | | | | | | | | | | Encoding.default_external was chosen over Encoding.default_internal because File.read is returning Encoding.default_external, therefore we should align with it. Alternatively, we could force both of them to be Encoding.default_internal. However, ideally this should be determined by different projects. For example, some projects might want to use an encoding different to what GitLab is using. This might not happen soon though. Closes #27052
* Merge branch 'rs-empty_project-for-associations' into 'master' Rémy Coutable2017-01-2618-23/+30
|\ | | | | | | | | Factories with a project association use `:empty_project` by default See merge request !8770
| * Use a project factory with a repository where necessaryrs-empty_project-for-associationsRobert Speicher2017-01-255-9/+15
| |
| * Factories with a project association use `:empty_project` by defaultRobert Speicher2017-01-2414-14/+15
| |
* | Merge branch 'rs-empty_project-helpers' into 'master' Rémy Coutable2017-01-2614-40/+41
|\ \ | | | | | | | | | | | | Use `:empty_project` where possible in helper specs See merge request !8796
| * | Use `:empty_project` where possible in helper specsrs-empty_project-helpersRobert Speicher2017-01-2514-40/+41
| |/
* | Merge branch 'rs-empty_project-controllers' into 'master' Rémy Coutable2017-01-2643-74/+67
|\ \ | | | | | | | | | | | | Use `:empty_project` where possible in controller specs See merge request !8797
| * | Use `empty_project` where possible in controller specsrs-empty_project-controllersRobert Speicher2017-01-2543-74/+67
| |/
* | Merge branch 'rs-empty_project-finders' into 'master' Rémy Coutable2017-01-2610-23/+23
|\ \ | | | | | | | | | | | | Use `:empty_project` where possible in finder specs See merge request !8794
| * | Use `:empty_project` where possible in finder specsrs-empty_project-findersRobert Speicher2017-01-2510-23/+23
| | |
* | | Merge branch '27203-fix-ruby21-broken-master' into 'master' Rémy Coutable2017-01-261-4/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Use hashrocket for dasherized attribute Closes #27203 See merge request !8775
| * | Use hashrocket for dasherized attribute27203-fix-ruby21-broken-masterRémy Coutable2017-01-251-4/+4
| | | | | | | | | | | | | | | | | | Otherwise Ruby 2.1 is not happy. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Update CHANGELOG.md for 8.16.2DJ Mountney2017-01-256-19/+8
| | | | | | | | | [ci skip]
* | | Merge branch '27013-regression-in-commit-title-bar' into 'master' Annabel Dunstone Gray2017-01-254-3/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "regression in commit title bar" Closes #27013 See merge request !8751
| * | | fixed points from comments to improve code qualitydimitrieh2017-01-252-4/+5
| | | |
| * | | added changelog entry27013-regression-in-commit-title-bardimitrieh2017-01-241-0/+4
| | | |
| * | | fixed repo view, last commit, with updated clipboard button orderdimitrieh2017-01-241-1/+6
| | | |
| * | | fixed commit title bardimitrieh2017-01-241-2/+1
| | | |
* | | | Merge branch ↵Annabel Dunstone Gray2017-01-254-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24895-branch-index-delete-button-inconsistently-spaced-and-misaligned' into 'master' Resolve "Branch index delete button inconsistently spaced and misaligned" Closes #24895 See merge request !8646
| * | | | properly center dropdown menu button in content-list context24895-branch-index-delete-button-inconsistently-spaced-and-misalignedMike Greiling2017-01-231-1/+2
| | | | |
| * | | | remove whitespace surrounding inline list controlsMike Greiling2017-01-232-2/+2
| | | | |
| * | | | remove whitespace surrounding dropdown buttonMike Greiling2017-01-231-1/+1
| | | | |
* | | | | Merge branch 'display-project-id' into 'master' 26001-show-tags-which-contain-a-given-commit-in-their-own-metadata-row-on-the-commit-page-widgetClement Ho2017-01-252-4/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display project ID Closes #18350 See merge request !8572
| * | | | | Display project ID in project settings (!8572)winniehell2017-01-252-4/+15
| | | | | |
* | | | | | Merge branch 'fix/26518' into 'master' Douwe Maan2017-01-254-6/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix access to the wiki code via HTTP when repository feature disabled Closes #26518 See merge request !8758
| * | | | | | Add CHANGELOG entryfix/26518Douglas Barbosa Alexandre2017-01-251-0/+4
| | | | | | |
| * | | | | | Fix access to the wiki code via HTTP when repository feature disabledDouglas Barbosa Alexandre2017-01-253-6/+34
| | | | | | |
* | | | | | | Merge branch 'copy-as-md' into 'master' Jacob Schatz2017-01-2512-41/+911
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copying a rendered issue/comment will paste into GFM textareas as actual GFM See merge request !8597
| * | | | | | | Statisfy eslintcopy-as-mdDouwe Maan2017-01-252-13/+13
| | | | | | | |
| * | | | | | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-25177-526/+1392
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| * | | | | | | Run tests in a single browser sessionDouwe Maan2017-01-241-66/+81
| | | | | | | |
| * | | | | | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-24417-1774/+4185
| |\ \ \ \ \ \ \
| * | | | | | | | Improve handling of code blocks containing triple backticksDouwe Maan2017-01-192-4/+30
| | | | | | | | |
| * | | | | | | | Improve support for linebreaks, tables and nested blockquotes in listsDouwe Maan2017-01-192-15/+31
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-19489-2201/+6387
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| * | | | | | | | | Remove unneeded checksDouwe Maan2017-01-191-4/+0
| | | | | | | | | |
| * | | | | | | | | Trigger autosize on the textarea after pastingDouwe Maan2017-01-192-1/+16
| | | | | | | | | |
| * | | | | | | | | Don't copy as GFM when more than GFM is selectedDouwe Maan2017-01-192-0/+6
| | | | | | | | | |
| * | | | | | | | | Remove unneeded codeDouwe Maan2017-01-192-4/+2
| | | | | | | | | |
| * | | | | | | | | Properly copy/paste allowed HTMLDouwe Maan2017-01-192-0/+53
| | | | | | | | | |
| * | | | | | | | | No needed to create an arrayDouwe Maan2017-01-181-2/+2
| | | | | | | | | |
| * | | | | | | | | Satisfy eslintDouwe Maan2017-01-182-65/+64
| | | | | | | | | |
| * | | | | | | | | Satisfy RubocopDouwe Maan2017-01-181-2/+0
| | | | | | | | | |
| * | | | | | | | | Move some functions to utilsDouwe Maan2017-01-184-61/+63
| | | | | | | | | |
| * | | | | | | | | Add more SyntaxHighlightFilter and MathFilter testsDouwe Maan2017-01-173-21/+150
| | | | | | | | | |
| * | | | | | | | | Fix ShortcutsIssuable#replyWithSelectedText testsDouwe Maan2017-01-173-34/+67
| | | | | | | | | |
| * | | | | | | | | Fix SyntaxHighlightFilter specDouwe Maan2017-01-173-5/+6
| | | | | | | | | |
| * | | | | | | | | Don't copy if there's nothing to copyDouwe Maan2017-01-161-0/+2
| | | | | | | | | |
| * | | | | | | | | Improve specDouwe Maan2017-01-163-157/+163
| | | | | | | | | |
| * | | | | | | | | Address style feedbackDouwe Maan2017-01-161-143/+150
| | | | | | | | | |
View Lorry Controller Status