summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Also render commit titles in HipChat notificationsDavid Eisner2016-10-201-4/+8
|
* Full Banzai rendering for HipChat notificationsDavid Eisner2016-10-201-11/+3
|
* Render hipchat notification descriptions as HTML instead of raw markdownAirat Shigapov2016-10-202-16/+13
|
* Merge branch 'project-cache-worker-lease' into 'master' Rémy Coutable2016-10-203-11/+57
|\ | | | | | | | | | | | | | | | | | | | | | | | | Restrict ProjectCacheWorker jobs to one per 15 min ## What does this MR do? This restricts performing ProjectCacheWorker jobs to once every 15 minutes per project. The goal of this is to reduce disk load in the event of a lot of pushes happening in a short period of time. The impact is that cached data (e.g. commit count) may be updated less frequently. Furthermore it could mean that separate push payloads won't lead to e.g. READMEs being updated. Most of the cached data isn't updated very frequently, so this trade off should be worth it considering the alternative is a burning storage layer. In the future we'll have to flush caches in a smarter way. For example, refreshing the README cache could probably be done separately from the other caches with its own lease and such. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23550 for more information. See merge request !7017
| * Restrict ProjectCacheWorker jobs to one per 15 minproject-cache-worker-leaseYorick Peterse2016-10-203-11/+57
| | | | | | | | | | | | | | This ensures ProjectCacheWorker jobs for a given project are performed at most once per 15 minutes. This should reduce disk load a bit in cases where there are multiple pushes happening (which should schedule multiple ProjectCacheWorker jobs).
* | Merge branch 'remove-unused-code-project-members-controller' into 'master' Dmitriy Zaporozhets2016-10-201-15/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Removed code from project members controller ## What does this MR do? Removes code that was meant to be added to a different branch as an experiment. See merge request !7012
| * | Removed code from project members controllerPhil Hughes2016-10-201-15/+0
| |/ | | | | | | This code was meant to be added to another branch as an expirement, but instead was commited to wrong branch
* | Merge branch 'fix-label-api-spec' into 'master' Douwe Maan2016-10-201-2/+1
|\ \ | | | | | | | | | | | | Make label API spec independent of order See merge request !7013
| * | Make label API spec independent of orderDouwe Maan2016-10-201-2/+1
| | |
* | | Merge branch 'issue_22944' into 'master' Sean McGivern2016-10-205-10/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Create project feature when project is created closes #22944 See merge request !6908
| * | | Create project feature when project is createdissue_22944Felipe Artur2016-10-195-10/+42
| | | |
* | | | Merge branch 'refactoring_find_commits_method' into 'master' Sean McGivern2016-10-203-9/+8
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Refactoring find_commits method It's possible that `find_commits_by_message` return nil in array which is not OK. We have different checks outside of this method. This MR places all checks inside the method. See merge request !7000
| * | | Refactoring find_commits functionalityValery Sizov2016-10-203-9/+8
| | | |
* | | | Merge branch '23555-project-api-doc' into 'master' Rémy Coutable2016-10-202-4/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Breaking a parameter table in Projects API doc" ## What does this MR do? - A broken markdown in `Search for projects by name` is fixed. - cf. !6681 - Pagination is removed from `Search for projects by name` like other docs as it is shown in [/api/README.html](https://docs.gitlab.com/ce/api/README.html) ## Moving docs to a new location? No. ## What are the relevant issue numbers? Closes #23555 See merge request !7007
| * | | Remove pagination description from individual docTakuya Noguchi2016-10-201-2/+0
| | | |
| * | | Fix a broken table in Project API docTakuya Noguchi2016-10-202-4/+5
| | |/ | |/|
* | | Merge branch '6967-toggle_award_url'Douwe Maan2016-10-202-2/+3
|\ \ \
| * | | Simpler arguments passed to named_route on toggle_award_url helper method6967-toggle_award_urlPaco Guzman2016-10-192-2/+3
| | | |
* | | | Merge branch 'add_user_expire_leave_event' into 'master' Sean McGivern2016-10-2013-45/+161
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Differentiate the expire from leave event At the moment we cannot see whether a user left a project due to their membership expiring or if they themselves opted to leave the project. This adds a new event type that allows us to make this differentiation. Note that is not really feasible to go back and reliably fix up the previous events. As a result the events for previous expire removals will remain the same however events of this nature going forward will be correctly represented. Closes #22611 ![Screen_Shot_2016-10-06_at_09.27.52](/uploads/e4de7bd2cdedc64a9b19e56fefa21314/Screen_Shot_2016-10-06_at_09.27.52.png) See merge request !6717
| * | | | Differentiate the expire from leave eventCallum Dryden2016-10-2013-45/+161
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment we cannot see weather a user left a project due to their membership expiring of if they themselves opted to leave the project. This adds a new event type that allows us to make this differentiation. Note that is not really feasable to go back and reliably fix up the previous events. As a result the events for previous expire removals will remain the same however events of this nature going forward will be correctly represented.
* | | | Merge branch 'boards-blank-state-size-fix' into 'master' Fatih Acet2016-10-201-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed height of issue board blank state ## What does this MR do? The height of the issue board blank state was causing some weird scrolling issues. This MR changes the height of the blank state. See merge request !6960
| * | | | Fixed height of issue board blank stateboards-blank-state-size-fixPhil Hughes2016-10-181-2/+1
| | | | |
* | | | | Merge branch '23346-pipeline-buttons-cutoff' into 'master' Fatih Acet2016-10-201-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smaller min-width for MR pipeline table ## What does this MR do? Nests class under `.tab-pane` to make sure buttons don't get cut off ## Screenshots (if relevant) ![Screen_Shot_2016-10-14_at_11.00.02_AM](/uploads/6e19e0375721f2cb58223c2e7ed89308/Screen_Shot_2016-10-14_at_11.00.02_AM.png) ## What are the relevant issue numbers? Closes #23346 See merge request !6893
| * | | | Smaller min-width for MR pipeline table23346-pipeline-buttons-cutoffAnnabel Dunstone Gray2016-10-171-0/+4
| | | | |
* | | | | Merge branch 'ios-tooltips' into 'master' Annabel Dunstone Gray2016-10-194-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set webkit-overflow-scrolling to auto for children of body. ## What does this MR do? Fixes weird tooltip layering behavior in iOS Safari. See screenshots and/or the original issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/22816 ## Why was this MR needed? Tooltips were cutoff in Safari. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-18_at_7.13.11_PM](/uploads/5558d60b7369a9355f18d34dcc2c179e/Screen_Shot_2016-10-18_at_7.13.11_PM.png) After: ![Screen_Shot_2016-10-18_at_7.13.40_PM](/uploads/ae07002f2f396f135b3078538d5c4ad6/Screen_Shot_2016-10-18_at_7.13.40_PM.png) Also, as part of this fix, I removed applications of `-webkit-overflow-scrolling: auto` in two other places where they're no longer needed. One was the file-holder. I made sure I could reproduce the behavior this was intended to fix, and then made sure this MR still fixed it. Here's the errant behavior: ![2016-10-18_19.00.22](/uploads/0bd3ee3bab44769dfce80c7edaac3248/2016-10-18_19.00.22.gif) Here's what it looks like with this MR: ![2016-10-18_19.00.49](/uploads/e405ded5acdbbbe5e577222c11198691/2016-10-18_19.00.49.gif) ## Does this MR meet the acceptance criteria? - [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) - [ ] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6962
| * | | | | Set webkit-overflow-scrolling to auto for children of body.ios-tooltipsBryce Johnson2016-10-194-2/+13
| | | | | |
* | | | | | Merge branch '23375-filtering-on-any-label-or-no-label-does-not-work' into ↵Fatih Acet2016-10-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix 'No label' and 'Any label' filters ## What does this MR do? Returns the `title`as the `id` for `No label`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Label filters not working as expected ## Screenshots (if relevant) ![2016-10-19_04.58.08](/uploads/3b079bf28299c1155e0243171ac008f6/2016-10-19_04.58.08.gif) ## 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? Closes #23375 See merge request !6974
| * | | | | | Return the title for id of 'No label'23375-filtering-on-any-label-or-no-label-does-not-workLuke Bennett2016-10-191-1/+1
| | | | | | |
* | | | | | | Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-19116-450/+1991
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add group level labels ## What does this MR do? Add group level labels. ## Are there points in the code the reviewer needs to double check? * `LabelsFinder` * `Gitlab::Gfm::ReferenceRewriter` * `Banzai::Filter::LabelReferenceFilter` ## Why was this MR needed? We'll be adding more feature that allow you to do cross-project management of issues. ## Screenshots (if relevant) * Group Labels ![Group Labels](/uploads/2244c06ad68eae4fb246fb4c81bf8060/2.png) * Project Labels ![Project Labels](/uploads/c5839516d2282b51f7418d9dadbeceb4/1.png) * Expanded references for group labels when moving issue to another project ![Expanded references for group labels when moving issue to another project](/uploads/0c9ab248a8420d4978d59349ae3d42e5/3.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [ ] 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? #19997 See merge request !6425
| * | | | | | | Use LabelsFinder on Fogbuz importerDouglas Barbosa Alexandre2016-10-191-1/+2
| | | | | | | |
| * | | | | | | Use LabelsFinder on Google Code importerDouglas Barbosa Alexandre2016-10-191-1/+2
| | | | | | | |
| * | | | | | | Avoid touch label links that does not belongs to project when moving itfeature/group-level-labelsDouglas Barbosa Alexandre2016-10-192-27/+59
| | | | | | | |
| * | | | | | | Remove order by label type on LabelsFinderDouglas Barbosa Alexandre2016-10-192-2/+2
| | | | | | | |
| * | | | | | | Rename Labels::CreateService to Labels::FindOrCreateServiceDouglas Barbosa Alexandre2016-10-1910-10/+10
| | | | | | | |
| * | | | | | | Add self.project_foreign_key on both Issue and MergeRequestDouglas Barbosa Alexandre2016-10-193-7/+9
| | | | | | | |
| * | | | | | | Only show label type for projects that belong to a groupDouglas Barbosa Alexandre2016-10-191-2/+3
| | | | | | | |
| * | | | | | | Disable subscribing to group-level labelsDouglas Barbosa Alexandre2016-10-195-20/+27
| | | | | | | |
| * | | | | | | Remove unused method Project#all_labelsDouglas Barbosa Alexandre2016-10-191-4/+0
| | | | | | | |
| * | | | | | | Update specs to cope with new label types and prioritiesJames Lopez2016-10-1911-21/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed all related specs and also changed the logic to handle edge cases. This includes exporting and exporting of group labels, which will get associated with the new group (if any) or they will become normal project labels otherwise. Found other issues to do with not being able to import all labels at once in the beginning of the JSON - code was much simpler when we import all labels and milestones associated to a project first, then the associations will find the already created labels instead of creating them from the associations themselves.
| * | | | | | | Fix max number of permitted priorities per project labelDouglas Barbosa Alexandre2016-10-191-2/+2
| | | | | | | |
| * | | | | | | Fix GitHub importer specDouglas Barbosa Alexandre2016-10-192-2/+5
| | | | | | | |
| * | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-10-191-0/+1
| | | | | | | |
| * | | | | | | Add support to group labels to SlashCommands::InterpretServiceDouglas Barbosa Alexandre2016-10-192-3/+5
| | | | | | | |
| * | | | | | | Use join instead of subquery on Label.unprioritized scopeDouglas Barbosa Alexandre2016-10-191-1/+8
| | | | | | | |
| * | | | | | | Warn user deleting a group label affect all projects within the groupDouglas Barbosa Alexandre2016-10-192-1/+8
| | | | | | | |
| * | | | | | | Use `includes(:priorities)` on Projects::LabelsControllerDouglas Barbosa Alexandre2016-10-191-1/+1
| | | | | | | |
| * | | | | | | Split migration to create label prioritiesDouglas Barbosa Alexandre2016-10-194-32/+55
| | | | | | | |
| * | | | | | | User Labes::CreateService to create labelsDouglas Barbosa Alexandre2016-10-198-20/+17
| | | | | | | |
| * | | | | | | Add service to create project labelsDouglas Barbosa Alexandre2016-10-192-0/+84
| | | | | | | |
| * | | | | | | Recreates the label priorities when moving project to another groupDouglas Barbosa Alexandre2016-10-192-1/+12
| | | | | | | |