summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Do not run before_script, artifacts, cache in trigger_docs jobtrigger-docs-yamlAchilleas Pipinellis2016-10-131-0/+3
|
* Merge branch '22655-deployments-don-t-always-have-keep-around-refs' into ↵Rémy Coutable2016-10-132-1/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Handle case where deployment ref no longer exists ## What does this MR do? In 8.9, we didn't create keep-around refs for deployments. So it's possible that someone created a deployment (say, for testing), and then deleted the branch and all other references to that commit. That commit could then get GCed, and trying to view MRs on 8.11+ will show a 500. See https://gitlab.com/gitlab-org/gitlab-ce/issues/22655#note_16575020 for more details. ## Why was this MR needed? If someone created a deployment on 8.9, then deleted all references to the commit for that deployment, we will throw an exception when checking if the deployment includes a commit. Closes #22655. See merge request !6855
| * Handle case where deployment ref no longer exists22655-deployments-don-t-always-have-keep-around-refsSean McGivern2016-10-132-1/+17
| | | | | | | | | | | | | | Keep-around refs for deployments were only introduced in 8.10, so any deployment created in 8.9 could have a SHA pointing to a commit that no longer exists in the repository. We can't do anything useful with those deployments, so make `#includes_commit?` always return false for those.
* | Merge branch 'api-order-mounts' into 'master' Rémy Coutable2016-10-131-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort API mounts ## What does this MR do? Sort the API mounts. ## Why was this MR needed? The API mounts are unsorted. See merge request !6831
| * | Sort API mountsapi-order-mountsRobert Schilling2016-10-131-4/+4
| | |
* | | Merge branch '22591-Convert-UTF-8-Emoji-to-Gitlab-emoji' into 'master' Rémy Coutable2016-10-134-8/+141
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert unicode emojis to images. ## Why was this MR needed? For better cross platform interoperability with emojis. Closes #22591 See merge request !6829
| * | | Convert UTF-8 Emoji to Gitlab emojiJohan H2016-10-134-20/+43
| | | |
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-cehenrik2016-10-12109-1901/+3553
| |\ \ \
| * \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-cehenrik2016-10-1120-751/+939
| |\ \ \ \
| * | | | | Convert unicode emojis to images.henrik2016-10-118-12/+181
| | | | | |
* | | | | | Merge branch 'use-language-colours-for-graph' into 'master' Sean McGivern2016-10-133-3/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use defined colour for a language when available ## What does this MR do? This MR changes the colours of the different languages in the language graph. It now uses the colour set in Linguist instead of the first six characters of the SHA256'd language name where possible. If Linguist has no colour defined for a given language, it falls back to the old method of finding a colour. I talked with @connorshea about creating this MR [on Twitter](https://twitter.com/connorjshea/status/784390886222286849) a few hours earlier. Here's also an older [tweet from May](https://twitter.com/nilsding/status/737018807223496708) where we discussed some possible improvements to the graph. ## Are there points in the code the reviewer needs to double check? Hopefully none ;) ## Why was this MR needed? Aesthetics. ## Screenshots (if relevant) Before: ![language_colours_before](/uploads/6b4bac784860da746d58708bdd6bba39/language_colours_before.png) After: ![language_colours_after](/uploads/98818ebf48ffb47e6b785120e69b0b6c/language_colours_after.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? - #12455 See merge request !6748
| * | | | | | Fix indentation and change inner matcherGeorg G2016-10-131-5/+5
| | | | | | |
| * | | | | | Use test double and matchersGeorg G2016-10-131-6/+7
| | | | | | |
| * | | | | | Add spec for Projects::GraphsController#languagesGeorg G2016-10-121-0/+43
| | | | | | |
| * | | | | | Use Linguist::Language[] instead of creating a hashGeorg G2016-10-102-5/+2
| | | | | | |
| * | | | | | Use defined colour for a language when availableGeorg G2016-10-071-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the colours of languages in the language graph to the ones Linguist has defined. When there is no colour defined for a language in Linguist, it will fall back to the old method of finding a colour.
* | | | | | | Merge branch 'rs-loosen-request_store' into 'master' Dmitriy Zaporozhets2016-10-132-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loosen requirement on request_store version This gem follows semantic versioning and will not introduce breaking changes in a minor version. See https://github.com/steveklabnik/request_store#semantic-versioning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868 See merge request !6853
| * | | | | | | Loosen requirement on request_store versionRobert Speicher2016-10-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gem follows semantic versioning and will not introduce breaking changes in a minor version. See https://github.com/steveklabnik/request_store#semantic-versioning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
* | | | | | | | Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-1355-303/+528
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring Issues Board ## What does this MR do? This MR aims to minimize conflicts between the CE issues board feature with EE multiple boards feature. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To avoid a lot of conflicts with EE multiple boards feature. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] API support added - Tests - [X] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/929 https://gitlab.com/gitlab-org/gitlab-ee/issues/1084 See merge request !6727
| * | | | | | | | Updated JS to work with issue index & showfeature/issues-boardPhil Hughes2016-10-124-4/+5
| | | | | | | | |
| * | | | | | | | Moved data attribute values into helper methodPhil Hughes2016-10-123-10/+14
| | | | | | | | |
| * | | | | | | | Fixed JS testsPhil Hughes2016-10-114-7/+7
| | | | | | | | |
| * | | | | | | | Updated to pass the board ID with the boards root to save conflicts with EEPhil Hughes2016-10-114-8/+11
| | | | | | | | |
| * | | | | | | | Fix board relates specsDouglas Barbosa Alexandre2016-10-115-16/+13
| | | | | | | | |
| * | | | | | | | Add Project::BoardLimitExcedeed error classDouglas Barbosa Alexandre2016-10-112-2/+4
| | | | | | | | |
| * | | | | | | | Update endpoint path for the frontendPhil Hughes2016-10-112-1/+20
| | | | | | | | |
| * | | | | | | | Fix typo on Boards::Issues::ListService specDouglas Barbosa Alexandre2016-10-111-1/+1
| | | | | | | | |
| * | | | | | | | Remove Boards::BaseServiceDouglas Barbosa Alexandre2016-10-1111-14/+10
| | | | | | | | |
| * | | | | | | | Update Issue Board API to handle with has_many associationDouglas Barbosa Alexandre2016-10-111-14/+17
| | | | | | | | |
| * | | | | | | | Update board specs to use board factory instead of project_with_boardDouglas Barbosa Alexandre2016-10-116-15/+15
| | | | | | | | |
| * | | | | | | | Refactoring service to create a new issue in a board listDouglas Barbosa Alexandre2016-10-114-19/+26
| | | | | | | | |
| * | | | | | | | Add Project#boards to import/export configuration fileDouglas Barbosa Alexandre2016-10-111-1/+1
| | | | | | | | |
| * | | | | | | | Fix links to issue boardsDouglas Barbosa Alexandre2016-10-113-3/+3
| | | | | | | | |
| * | | | | | | | Fix rubocop offensesDouglas Barbosa Alexandre2016-10-112-12/+12
| | | | | | | | |
| * | | | | | | | Remove unused Projects::BoardListsController controllerDouglas Barbosa Alexandre2016-10-111-65/+0
| | | | | | | | |
| * | | | | | | | Update endpoints to handle with board issuesDouglas Barbosa Alexandre2016-10-112-17/+40
| | | | | | | | |
| * | | | | | | | Update endpoints to handle with board list changesDouglas Barbosa Alexandre2016-10-112-33/+42
| | | | | | | | |
| * | | | | | | | Update Boards::Lists::DestroyService to remove list on a specic boardDouglas Barbosa Alexandre2016-10-111-0/+4
| | | | | | | | |
| * | | | | | | | Update Projects::BoardsController#show to look up for a specific boardDouglas Barbosa Alexandre2016-10-112-11/+41
| | | | | | | | |
| * | | | | | | | Add index action to Projects::BoardsController to return project boardsDouglas Barbosa Alexandre2016-10-116-4/+76
| | | | | | | | |
| * | | | | | | | Add Boards::ListService service to list project boardsDouglas Barbosa Alexandre2016-10-112-0/+51
| | | | | | | | |
| * | | | | | | | Removes all labels from project boards when moving and issue to doneDouglas Barbosa Alexandre2016-10-112-16/+20
| | | | | | | | |
| * | | | | | | | Update Boards::Issues::MoveService to move issues on a specific boardDouglas Barbosa Alexandre2016-10-112-12/+16
| | | | | | | | |
| * | | | | | | | Update Boards::Issues::ListService to list issues for a board listDouglas Barbosa Alexandre2016-10-112-7/+28
| | | | | | | | |
| * | | | | | | | Update Boards::Lists::MoveService to move lists inside a specific boardDouglas Barbosa Alexandre2016-10-112-5/+6
| | | | | | | | |
| * | | | | | | | Update Boards::Lists::GenerateService to generate for a specific boardDouglas Barbosa Alexandre2016-10-112-10/+10
| | | | | | | | |
| * | | | | | | | Update Boards::Lists::CreateService to create lists for a specific boardDouglas Barbosa Alexandre2016-10-113-13/+12
| | | | | | | | |
| * | | | | | | | Add Boards::Lists::ListService to list lists for a specific boardDouglas Barbosa Alexandre2016-10-112-0/+27
| | | | | | | | |
| * | | | | | | | Update Boards::CreateService to handle with the has_many associationDouglas Barbosa Alexandre2016-10-114-25/+25
| | | | | | | | |
| * | | | | | | | Restrict the number of permitted boards per project to oneDouglas Barbosa Alexandre2016-10-112-1/+15
| | | | | | | | |
View Lorry Controller Status