summaryrefslogtreecommitdiff
path: root/app/models/concerns
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix/label-filters' into 'master' Douwe Maan2016-04-211-1/+8
|\ | | | | | | | | | | | | Filter labels by including ALL filter titles Fixed query to use `AND` and not `OR`. Refactored relevant specs See merge request !3815
| * udpated a few things based on MR feedback. Also added model specJames Lopez2016-04-201-1/+8
| |
| * filter labels by including all filter titles as part of the queryJames Lopez2016-04-191-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-191-4/+6
|\ \ | |/ | | | | | | # Conflicts: # db/schema.rb
| * Use GitHub Issue/PR number as iid to keep referencesDouglas Barbosa Alexandre2016-04-181-4/+6
| | | | | | | | | | With these changes we don’t lost the issue/pr references when importing them to GitLab.
* | Make some logic less twistableKamil Trzcinski2016-04-171-1/+1
| |
* | Write specs for this featureKamil Trzcinski2016-04-161-1/+1
| |
* | Rename CiStatus to StatusableKamil Trzcinski2016-04-161-2/+2
| |
* | Update handling of skipped statusKamil Trzcinski2016-04-131-1/+9
| |
* | Support skipped statusKamil Trzcinski2016-04-131-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-131-15/+0
|\ \ | |/
| * Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-081-1/+2
| |\
| * | Update NotificationService to use NotificationSettings instead of membershipDmitriy Zaporozhets2016-03-301-15/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix CiStatus implementation and testsKamil Trzcinski2016-04-131-9/+11
| | |
* | | Optimise CI status accessorKamil Trzcinski2016-04-121-16/+22
| | |
* | | Optimise CI status accessorKamil Trzcinski2016-04-121-0/+1
| | |
* | | Fix rest of rspec and spinach testsKamil Trzcinski2016-04-121-2/+4
| | |
* | | Fix specsKamil Trzcinski2016-04-111-1/+2
| | |
* | | Use Ci::Commit as PipelineKamil Trzcinski2016-04-111-0/+58
| |/ |/|
* | Fix bug related to filtering Issues by Label/Milestone.issue_14853Rubén Dávila2016-04-021-1/+1
| | | | | | | | This problem only was affecting the dev env.
* | Destroy related todos when an issue is deletedDouglas Barbosa Alexandre2016-03-301-0/+1
|/
* Fix sorting issues/mrs by votes on the groups pagefix-sorting-by-votes-on-groups-pageDouglas Barbosa Alexandre2016-03-211-1/+1
| | | | | | | | The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/conc erns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors.
* Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-211-0/+9
|\
| * Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-191-8/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (121 commits) Dedupe labels in labels selector in Dashboard pages Refactor colors and lists Add a safeguard in MergeRequest#compute_diverged_commits_count Fix an issue when the target branch of a MR had been deleted Add avatar to issue and MR pages header Cleanup somce css colors Re-group scss variables Refactor `Todo#target` Fixes issue with filter label missing on labels & milestones Rename `Todo#to_reference` to `Todo#target_reference` Fixed failing tests Updated controller with before_action Fixed other issues based on feedback Fixes issue on dashboard issues Full labels data in JSON Fixed issue with labels dropdown getting wrong labels Update CHANGELOG Use `Note#for_project_snippet?` to skip notes on project snippet Use `Commit#short_id` instead of `Commit.truncate_sha` Reuse `for_commit?` on conditional validations Update schema info comment on todo related files ... Conflicts: app/models/issue.rb db/schema.rb spec/models/issue_spec.rb
| * | Improvements in issue move feaure (refactoring)Grzegorz Bizon2016-03-191-0/+9
| | | | | | | | | | | | According to endbosses' suggestions.
* | | Dry destroy action on issuablesZeger-Jan van de Weg2016-03-192-5/+6
| | |
* | | Hide delete botton on edit pageZeger-Jan van de Weg2016-03-191-2/+1
| | |
* | | Soft delete issuablesZeger-Jan van de Weg2016-03-191-1/+6
| |/ |/|
* | Restrict access for confidential issues on milestone viewDouglas Barbosa Alexandre2016-03-171-8/+12
|/
* Improving the original label-subscribing implementationRémy Coutable2016-03-152-18/+17
| | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
* Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-152-23/+50
| | | | | | | | | | | | | | | | | | 1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
* Use ILIKE/LIKE for Issuable.search and full_searchYorick Peterse2016-03-111-2/+19
|
* Updates from last code review.issue_13621_2Rubén Dávila2016-03-062-0/+27
|
* Refactor GlobalMilestone queries.Rubén Dávila2016-03-041-0/+1
| | | | Make methods return ActiveRecord Relations instead of Arrays.
* Don't list issues from archived projects in Group view.Rubén Dávila2016-03-021-0/+1
|
* Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-171-0/+25
|
* Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-111-7/+4
| | | | | | | | | | | - Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead
* Add assignee data to Issuables' hook_databrammeleman/3047-add-assignee-data-to-isuable-hook-dataBram Daams2016-02-101-1/+4
|
* Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-0/+6
|\ | | | | | | | | | | | | | | | | | | | | Unsubscribe from thread through link in email footer Closes #3437 ![Screenshot_from_2015-12-11_15-35-06](/uploads/cfb3d8737d4757f527995411f103d0ce/Screenshot_from_2015-12-11_15-35-06.png) ![Screenshot_from_2015-12-11_15-35-56](/uploads/9b7121be7ce4b05e5995ca6d38c5bea4/Screenshot_from_2015-12-11_15-35-56.png) See merge request !2068
| * Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-0/+6
| |
* | Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-071-0/+3
|/ | | | | | | | | Sorting by "id" has the same effect as sorting by created_at while performing far better and without the need of an extra index (in case one wanted to speed up sorting by "created_at"). Sorting by "Recently updated" still uses the physical "updated_at" column as there's no way to use the "id" column for this instead.
* Fix mentionable reference extraction caching.Douwe Maan2016-01-061-2/+5
|
* Merge branch 'upvote_count_to_api' into 'master' Valery Sizov2015-12-291-4/+2
|\ | | | | | | | | | | | | Revert upvotes and downvotes params back to MR API issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 See merge request !2212
| * Revert upvotes and downvotes params to MR APIValery Sizov2015-12-281-4/+2
| |
* | Merge branch 'mention-all' into 'master' Robert Speicher2015-12-271-1/+1
|\ \ | |/ |/| | | | | | | | | Only allow group/project members to mention `@all` Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3473 See merge request !2205
| * Only allow group/project members to mention `@all`Douwe Maan2015-12-241-1/+1
| |
* | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-241-0/+8
|/
* Use method that creates runners registration tokenGrzegorz Bizon2015-12-231-1/+0
| | | | `runners_registration_token` now creates a new token if it is blank.
* Add method that persist ensured token in `TokenAuthenticatable`Grzegorz Bizon2015-12-231-2/+13
|
* Fix method that ensures authentication tokenGrzegorz Bizon2015-12-231-6/+2
| | | | | | Until now, `ensure_#{token_filed_name}` method didn't persist new token in database. This closes #4235.