summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fixed undefined keycode build errorgl-dropdown-render-perfPhil Hughes2016-10-141-3/+0
|
* Fixed keycode undefinedPhil Hughes2016-10-131-5/+1
|
* Changed trigger keyup to inputPhil Hughes2016-10-131-5/+3
|
* Fixed appending jQuery elementsPhil Hughes2016-10-131-0/+4
|
* Fixed rendering of HTML stringsPhil Hughes2016-10-131-1/+7
|
* Increased performance of GL dropdown renderItemPhil Hughes2016-10-131-32/+31
| | | | | | | | - Fixes an issue where `renderItem` is called several times even when not required - Increased performance when rendering dropdown items Closes #21110
* Merge branch 'remove-unique-keyframes' into 'master' Annabel Dunstone Gray2016-10-132-42/+43
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace unique keyframes mixin with specific keyframe animation names ## What does this MR do? Replaces `unique-keyframes` mixin with `include-keyframes` mixin ## Are there points in the code the reviewer needs to double check? Shouldn't be :thumbsup_tone1: ## Why was this MR needed? Some users had GitLab hosted in a distributed environment that makes `unique-keyframes` a non-viable implementation. The randomized animation names from `unique-keyframes` was not being picked up by the different servers which resulted in 404 errors. ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] 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) - [x] 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? Closes #22629 See merge request !6603
| * Replace unique keyframes mixin with specific keyframe animation namesClement Ho2016-10-132-42/+43
| |
* | Merge branch '22655-deployments-don-t-always-have-keep-around-refs' into ↵Rémy Coutable2016-10-131-1/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-131-1/+8
| | | | | | | | | | | | | | | | | | | | | 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 'use-language-colours-for-graph' into 'master' Sean McGivern2016-10-131-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Use Linguist::Language[] instead of creating a hashGeorg G2016-10-101-5/+1
| | | |
| * | | 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 'feature/issues-board' into 'master' Sean McGivern2016-10-1327-132/+166
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| * | | | 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-111-1/+1
| | | | |
| * | | | Add Project::BoardLimitExcedeed error classDouglas Barbosa Alexandre2016-10-111-1/+3
| | | | |
| * | | | Update endpoint path for the frontendPhil Hughes2016-10-112-1/+20
| | | | |
| * | | | Remove Boards::BaseServiceDouglas Barbosa Alexandre2016-10-1111-14/+10
| | | | |
| * | | | Refactoring service to create a new issue in a board listDouglas Barbosa Alexandre2016-10-112-7/+13
| | | | |
| * | | | Fix links to issue boardsDouglas Barbosa Alexandre2016-10-113-3/+3
| | | | |
| * | | | Remove unused Projects::BoardListsController controllerDouglas Barbosa Alexandre2016-10-111-65/+0
| | | | |
| * | | | Update endpoints to handle with board issuesDouglas Barbosa Alexandre2016-10-111-2/+2
| | | | |
| * | | | Update endpoints to handle with board list changesDouglas Barbosa Alexandre2016-10-111-7/+11
| | | | |
| * | | | 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-111-2/+13
| | | | |
| * | | | Add index action to Projects::BoardsController to return project boardsDouglas Barbosa Alexandre2016-10-112-3/+12
| | | | |
| * | | | Add Boards::ListService service to list project boardsDouglas Barbosa Alexandre2016-10-111-0/+14
| | | | |
| * | | | Removes all labels from project boards when moving and issue to doneDouglas Barbosa Alexandre2016-10-111-1/+1
| | | | |
| * | | | Update Boards::Issues::MoveService to move issues on a specific boardDouglas Barbosa Alexandre2016-10-111-0/+4
| | | | |
| * | | | Update Boards::Issues::ListService to list issues for a board listDouglas Barbosa Alexandre2016-10-111-0/+4
| | | | |
| * | | | Update Boards::Lists::MoveService to move lists inside a specific boardDouglas Barbosa Alexandre2016-10-111-1/+2
| | | | |
| * | | | Update Boards::Lists::GenerateService to generate for a specific boardDouglas Barbosa Alexandre2016-10-111-4/+4
| | | | |
| * | | | Update Boards::Lists::CreateService to create lists for a specific boardDouglas Barbosa Alexandre2016-10-112-6/+5
| | | | |
| * | | | Add Boards::Lists::ListService to list lists for a specific boardDouglas Barbosa Alexandre2016-10-111-0/+9
| | | | |
| * | | | Update Boards::CreateService to handle with the has_many associationDouglas Barbosa Alexandre2016-10-111-5/+10
| | | | |
| * | | | Restrict the number of permitted boards per project to oneDouglas Barbosa Alexandre2016-10-111-1/+6
| | | | |
| * | | | Allow projects to have many boardsDouglas Barbosa Alexandre2016-10-111-2/+1
| | | | |
* | | | | Merge branch ↵Rémy Coutable2016-10-131-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '23234-deleting-a-milestone-removes-source-branch-deletion-options-of-associated-merge-requests' into 'master' Maintain "force_remove_source_branch" options on Merge Request unless specified ## What does this MR do? Fixes a problem where Merge Requests were losing the state associated with the flag to remove the source branch upon merge * Closes #23234 * Closes #23191 * Closes #19351 See merge request !6817
| * | | | | Maintain "force_remove_source_branch" options on Merge Request unless specifiedMark Fletcher2016-10-131-1/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'feature/cycle-analytics-2-backend' into 'master' Douwe Maan2016-10-131-4/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement second iteration of cycle analytics - Change in data measurement Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/22458 Measure everything that happened in the given time range, not only what's been pushed to production. With the exception of the staging and production stages. - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] 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) - [x] 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) See merge request !6798
| * | | | | updated var name based on feedbackfeature/cycle-analytics-2-backendJames Lopez2016-10-131-2/+2
| | | | | |
| * | | | | Ignore deployment for statistics in Cycle Analytics, except in staging and ↵James Lopez2016-10-121-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | production stages Also, updated specs and docs.
* | | | | | Merge branch 'project-edit-branch-dropdown-fix' into 'master' Fatih Acet2016-10-131-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed default branch dropdown not converting to select2 ## What does this MR do? The LFS dropdown doesn't have the `data` attribute & it isn't needed because it doesn't hide/show any elements. This filters out the `<select>` without that attribute. ## What are the relevant issue numbers? Closes #23200 See merge request !6810
| * | | | | | Fixed default branch dropdown not converting to select2project-edit-branch-dropdown-fixPhil Hughes2016-10-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23200
* | | | | | | Merge branch 'grouped-builds-arrow' into 'master' Fatih Acet2016-10-132-7/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix overflow to show grouped builds arrow ## What does this MR do? Removes overflow style so that the arrow shows up again ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-11_at_9.11.55_AM](/uploads/92d2a0c34d2af050e58468c8d61f4cd3/Screen_Shot_2016-10-11_at_9.11.55_AM.png) After: ![Screen_Shot_2016-10-11_at_9.11.41_AM](/uploads/2c4c422a21fb6450d00ae638aef29d89/Screen_Shot_2016-10-11_at_9.11.41_AM.png) Scrolling: ![Screen_Shot_2016-10-11_at_9.40.36_AM](/uploads/e5b1e3125d881c5882cf199026110d48/Screen_Shot_2016-10-11_at_9.40.36_AM.png) See merge request !6808
| * | | | | | | Allow scrolling within grouped pipelinesgrouped-builds-arrowAnnabel Dunstone Gray2016-10-112-6/+11
| | | | | | | |
| * | | | | | | Fix overflow to show grouped builds arrowAnnabel Dunstone Gray2016-10-111-1/+0
| |/ / / / / /
View Lorry Controller Status