summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove jQuery UIbye-bye-jquery-uiPhil Hughes2017-03-024-6/+0
| | | | jQuery UI is no longer used anywhere so say goodbye to it from package.json & Gemfile
* Merge branch ↵Rémy Coutable2017-03-023-17/+39
|\ | | | | | | | | | | | | | | | | | | '28805-download-archive-with-branch-like-feature-xxxx-add-extra-directory-level' into 'master' Ensure archive download is only one directory deep Closes #28805 See merge request !9616
| * Ensure archive download is only one directory deepMark Fletcher2017-03-023-17/+39
| |
* | Merge branch 'gitaly-post-receive' into 'master' Robert Speicher2017-03-0210-0/+126
|\ \ | | | | | | | | | | | | Add internal endpoint to notify post-receive to Gitaly See merge request !8983
| * | Add internal endpoint to notify post-receive to Gitalygitaly-post-receiveAlejandro Rodríguez2017-03-0110-0/+126
| | |
* | | Merge branch 'rs-issue-28647' into 'master' Alfredo Sumaran2017-03-021-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix ES6 interpolation in GitLabCrop class Closes #28647 See merge request !9624
| * | Fix ES6 interpolation in GitLabCrop classrs-issue-28647Robert Speicher2017-03-011-1/+1
| | |
* | | Merge branch 'api-v4-doc' into 'master' Douwe Maan2017-03-0143-213/+213
|\ \ \ | | | | | | | | | | | | | | | | Use v4 endpoint in API docs See merge request !9631
| * | | Use v4 endpoint in API docsapi-v4-docRobert Schilling2017-03-0143-213/+213
| | | |
* | | | Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-0157-233/+389
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename MWBS to MWPS Closes #24707 See merge request !9335
| * | | | Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-0157-233/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename column in the database Rename fields related to import/export feature Rename API endpoints Rename documentation links Rename the rest of occurrences in the code Replace the images that contain the words "build succeeds" and docs referencing to them Make sure pipeline is green and nothing is missing. updated doc images renamed only_allow_merge_if_build_succeeds in projects and fixed references more updates fix some spec failures fix rubocop offences fix v3 api spec fix MR specs fixed issues with partials fix MR spec fix alignment add missing v3 to v4 doc wip - refactor v3 endpoints fix specs fix a few typos fix project specs copy entities fully to V3 fix entity error more fixes fix failing specs fixed missing entities in V3 API remove comment updated code based on feedback typo fix spec
* | | | | Merge branch 'fix/gb/improve-merge-request-pipelines-api' into 'master' Kamil Trzciński2017-03-013-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve internal API for new merge request Closes #27866 See merge request !9304
| * | | | | Fix rubocop errorfix/gb/improve-merge-request-pipelines-apiFilipa Lacerda2017-02-281-1/+2
| | | | | |
| * | | | | Adds frontend needed changes to accomodate for new endpoint schemaFilipa Lacerda2017-02-281-1/+3
| | | | | |
| * | | | | Reinstate new merge request pipelines hash in APIGrzegorz Bizon2017-02-282-3/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch '27142-api-replace-destroy-with-stop-environment' into 'master' Kamil Trzciński2017-03-015-3/+88
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Add environment action with /stop action Closes #27142 See merge request !8808
| * | | | | Add environment `/stop` action27142-api-replace-destroy-with-stop-environmentToon Claes2017-02-285-3/+88
| | | | | | | | | | | | | | | | | | | | | | | | Add endpoint to stop an environment through the API.
* | | | | | Merge branch 'fix/gb/remove-unused-method-from-build' into 'master' Kamil Trzciński2017-03-012-23/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused method from CI/CD build class See merge request !9615
| * | | | | | Remove unused method from CI/CD build classfix/gb/remove-unused-method-from-buildGrzegorz Bizon2017-03-012-23/+0
| | | | | | |
* | | | | | | Merge branch 'persona-images' into 'master' Allison Whilden2017-03-013-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persona images See merge request !9556
| * | | | | | | Persona imagesSarah O'Donnell2017-03-013-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'patch-17' into 'master' Rémy Coutable2017-03-011-24/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove duplicate backup skip details See merge request !9525
| * | | | | | | remove duplicate backup skip details Ben Bodenmiller2017-02-241-24/+8
| | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | | Merge branch 'patch-18' into 'master' Rémy Coutable2017-03-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix GitLab download archives link See merge request !9528
| * | | | | | | | fix GitLab download archives link Ben Bodenmiller2017-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | | | Merge branch '26136-list-repository-tree-api-doc' into 'master' Rémy Coutable2017-03-012-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarification of list repository tree API call Closes #26136 See merge request !9532
| * | | | | | | | | Clarification of list repository tree API callMarius Kleiner2017-03-012-0/+6
|/ / / / / / / / /
* | | | | | | | | 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.