summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove side padding from expanded sidebarright-sidebar-whitespaceAnnabel Dunstone Gray2017-03-011-4/+0
|
* Merge branch '27778-a11y-sidebar' into 'master' Clement Ho2017-03-015-20/+25
|\ | | | | | | | | | | | | Improve a11y in sidebar Closes #27778 See merge request !9593
| * Adds changelog27778-a11y-sidebarFilipa Lacerda2017-03-011-0/+5
| |
| * Fix linter errorsFilipa Lacerda2017-03-012-2/+2
| |
| * Improve a11y in sidebarFilipa Lacerda2017-02-284-20/+20
| |
* | Merge branch '28609-fix-redirect-to-home-page-url' into 'master' Robert Speicher2017-03-014-36/+62
|\ \ | | | | | | | | | | | | | | | | | | Fix the redirect to custom home page URL and move it to RootController Closes #28609 See merge request !9518
| * | Fix the redirect to custom home page URL and move it to RootController28609-fix-redirect-to-home-page-urlRémy Coutable2017-02-274-36/+62
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'use-v3-api-on-frontend' into 'master' Sean McGivern2017-03-011-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Add changelog for !9614 See merge request !9626
| * | | Add changelog for !9614Sean McGivern2017-03-011-0/+4
| | | |
* | | | Merge branch 'custom-empty-exception-class-cop' into 'master' Robert Speicher2017-03-0143-81/+239
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RuboCop cop for custom error classes Closes #28770 See merge request !9573
| * | | | Enable and autocorrect the CustomErrorClass copSean McGivern2017-03-0141-81/+64
| | | | |
| * | | | Add RuboCop cop for custom error classesSean McGivern2017-03-012-0/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the Ruby style guide: # bad class FooError < StandardError end # okish class FooError < StandardError; end # good FooError = Class.new(StandardError) This cop does that, but only for error classes (classes where the superclass ends in 'Error'). We have empty controllers and models, which are perfectly valid empty classes.
* | | | | Merge branch 'long-file-name-overflow' into 'master' Filipa Lacerda2017-03-014-10/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed long filename being under action buttons Closes #26607 See merge request !9608
| * | | | | Fixed long filename being under action buttonslong-file-name-overflowPhil Hughes2017-03-014-10/+17
| |/ / / / | | | | | | | | | | | | | | | Closes #26607
* | | | | Merge branch 'remove-new-relic-gem' into 'master' Sean McGivern2017-03-014-20/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the newrelic gem Closes #12860 See merge request !9622
| * | | | | Remove the newrelic gemremove-new-relic-gemRobert Schilling2017-03-014-20/+4
| | | | | |
* | | | | | Merge branch 'user-calendar-border' into 'master' Annabel Dunstone Gray2017-03-012-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed top border from contribution calendar Closes #28844 See merge request !9605
| * | | | | | Removed 0 paddinguser-calendar-borderPhil Hughes2017-03-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The extra spacing at the top is caused the user-callout box that should be fixed in another merge request
| * | | | | | Removed top border from contribution calendarPhil Hughes2017-03-012-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28844
* | | | | | | Merge branch 'js_should_user_right_api_version' into 'master' Sean McGivern2017-03-011-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The frontend should use the v3 API for now Closes #28863 and #28853 See merge request !9614
| * | | | | | Make JS use API v3 because v4 is not frozen yetjs_should_user_right_api_versionValery Sizov2017-03-011-1/+1
| | | | | | |
* | | | | | | Merge branch 'diff-make-obvious-cant-comment' into 'master' Annabel Dunstone Gray2017-03-018-7/+103
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visually display that expanded diff lines cant be commented on See merge request !9465
| * | | | | | | Disables interaction with expanded linesdiff-make-obvious-cant-commentPhil Hughes2017-02-287-21/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed scss-lint errors
| * | | | | | | Visually display that expanded diff lines cant be commented onPhil Hughes2017-02-287-1/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously you just had to hover over a line to see if it could be commented on, this changes that by changing the background color & borders to show that the line cant have a comment.
* | | | | | | | Merge branch 'fix/ci-status-badge-view-specs' into 'master' Robert Speicher2017-03-011-0/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add view specs for CI/CD detailed status badge Closes #25611 See merge request !9473
| * | | | | | | | Simplify view specs for commit status badge partialfix/ci-status-badge-view-specsGrzegorz Bizon2017-03-011-28/+33
| | | | | | | | |
| * | | | | | | | Improve readability in CI/CD status badge view testsGrzegorz Bizon2017-03-011-18/+17
| | | | | | | | |
| * | | | | | | | Add view specs for ci/cd detailed status badgeGrzegorz Bizon2017-03-011-0/+85
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '28850-fix-broken-migration' into 'master' Sean McGivern2017-03-012-4/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the inheritance column of services in DisableInvalidServiceTemplates migration Closes #28850 See merge request !9613
| * | | | | | | | Disable the inheritance column of services in DisableInvalidServiceTemplates ↵Rémy Coutable2017-03-012-4/+6
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration The `unless defined?(Service)` was useless since in production env, models are eager loaded, thus we wouldn't disable the STI, resulting in the following error: The single-table inheritance mechanism failed to locate the subclass: 'GitlabCiService'. This error is raised because the column 'type' is reserved for storing the class in case of inheritance. Please rename this column if you didn't intend it to be used for storing the inheritance class or overwrite Service.inheritance_column to use another column for that information./opt/gitlab/embedded/service/gitlab-rails/db/post_migrate/20170211073944_disable_invalid_service_templates.rb:11:in `up' Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'undefined' into 'master' Achilleas Pipinellis2017-03-011-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace create_new_project_button.png See merge request !9403
| * | | | | | | | Replace create_new_project_button.pngWilliam Abernathy2017-02-211-0/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'update-yarn-docs' into 'master' Jacob Schatz2017-03-011-4/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs to reflect Yarn support added in 8.17 not 9.0 See merge request !9590
| * | | | | | | | | update install doc to reflect start of yarn dependencyupdate-yarn-docsMike Greiling2017-02-281-4/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'feature/fix_tag_docs_parent_ids' into 'master' Rémy Coutable2017-03-011-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Tags: Fix typo in parent_ids in example response See merge request !9550
| * | | | | | | | | | Docs: Tags: Fix typo in parent_ids in example responseMichael Frister2017-02-271-2/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-03-011-0/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about how to use or escape variables inside other variables See merge request !9601
| * | | | | | | | | | Add note about how to use or escape variables inside other variablesTeNNoX2017-02-281-0/+10
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'board-new-issue-template-in-js' into 'master' Filipa Lacerda2017-03-017-91/+299
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved issue boards new issue form template See merge request !9572
| * | | | | | | | | | | Import vue into specboard-new-issue-template-in-jsPhil Hughes2017-03-011-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed eslintPhil Hughes2017-03-011-11/+13
| | | | | | | | | | | |
| * | | | | | | | | | | Moved issue boards new issue form templatePhil Hughes2017-03-017-91/+297
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'refactor/generalize-unique-internal-users' into 'master' Sean McGivern2017-03-011-14/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generalize the idea of a "unique internal user" See merge request !9562
| * | | | | | | | | | | use a more namespacey key for the exclusive leaserefactor/generalize-unique-internal-usershttp://jneen.net/2017-02-281-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | generalize the idea of a "unique internal user"http://jneen.net/2017-02-281-14/+22
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we will likely be needing this for other features, for example the Gitlab ServiceDesk support bot.
* | | | | | | | | | | Update CHANGELOG.md for 8.17.2James Lopez2017-03-011-0/+4
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'restructure-pages-docs' into 'master' Achilleas Pipinellis2017-03-015-582/+611
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restructure pages docs Closes #28688 See merge request !9527
| * | | | | | | | | | Restructure Pages docs index and getting started guidesrestructure-pages-docsMarcia Ramos2017-03-015-582/+611
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch '25437-just-emoji' into 'master'Sean McGivern2017-03-0116-86/+138
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #25437 Allow posting of just an emoji in comment; add /award slash command Closes #25437 See merge request !9382
| * | | | | | | | | add /award slash commandmhasbini2017-02-2816-86/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add /award slash command; Allow posting of just an emoji in comment