summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-0817-80/+90
|\
| * Add custom NamespaceNameValidatorRobert Speicher2015-12-071-3/+3
| |
| * Add custom NamespaceValidatorRobert Speicher2015-12-072-9/+5
| |
| * Add custom LineCodeValidatorRobert Speicher2015-12-072-2/+2
| |
| * Add custom ColorValidatorRobert Speicher2015-12-072-7/+5
| |
| * Add custom UrlValidatorRobert Speicher2015-12-078-37/+27
| |
| * Merge branch 'fix-parallel-merge' into 'master' Dmitriy Zaporozhets2015-12-071-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Dont use cached collection for Repository find_branch and find_tag methods Fix for #3816 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2003
| | * Dont use cached collection for Repository find_branch and find_tag methodsDmitriy Zaporozhets2015-12-071-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-12-071-17/+19
| |\ \ | | |/ | |/|
| | * Handle and report SSL errors in Web hook test. Check for status 200 for success.Stan Hu2015-12-041-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a Web hook test fails due to an SSL error or some other error, report the result back to the user instead of an Error 500. Closes #3656 Handle response
| * | Merge branch 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-072-3/+27
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add added, modified and removed properties to commit object in webhook https://gitlab.com/gitlab-org/gitlab-ee/issues/20 See merge request !1988
| | * | fixes after reviewwebhook_payload_with_changesValery Sizov2015-12-071-16/+9
| | | |
| | * | fox specsValery Sizov2015-12-072-15/+24
| | | |
| | * | Add added, modified and removed properties to commit object in webhookValery Sizov2015-12-041-1/+23
| | |/
* | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0716-89/+235
|\ \ \ | |/ /
| * | Merge branch 'gsmethells/gitlab-ce-sort-by-due-date'Douwe Maan2015-12-071-0/+29
| |\ \
| | * | Satisfy RubocopDouwe Maan2015-12-071-1/+1
| | | |
| | * | Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-dateDouwe Maan2015-12-0713-63/+146
| | |\ \
| | * | | sort milestones by due_dateGreg Smethells2015-12-031-1/+30
| | | | |
| * | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-071-0/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems with award-emoji-only comment This fixes a conflict between note with only a single emoji in content and award-emojis mechanisms. Closes #3734 cc @vsizov See merge request !1936
| | * | | | Simplify `contains_emoji_only?` method in `Note`fix/award-emoji-conflict-in-notesGrzegorz Bizon2015-12-071-2/+1
| | | | | |
| | * | | | Refactor note awards to reuse `emoji_pattern` and improve validatorGrzegorz Bizon2015-12-051-18/+14
| | | | | |
| | * | | | Make method `supports_award?` public in `Note`Grzegorz Bizon2015-12-031-2/+2
| | | | | |
| | * | | | Support emoji awards also in merge requestsGrzegorz Bizon2015-12-031-3/+4
| | | | | |
| | * | | | Move note emoji-award implementation to note model (feature envy)Grzegorz Bizon2015-12-031-0/+33
| | | | | |
| | * | | | Add validator for award-emoji noteGrzegorz Bizon2015-12-031-0/+1
| | |/ / /
| * | | | Merge branch 'fix-global-milestones-error-500' into 'master' Douwe Maan2015-12-071-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when creating global milestones with Unicode characters Two issues: 1. The constraints in the resources were incorrect. Here's what it was before: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` In this case, id is actually the title of the milestone, which can be anything at the moment. After: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` 2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like: ``` ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]): ``` This change uses the babosa library to create a better slug, which surprisingly isn't actually used by the global milestone controllers. Instead, they use the title passed as a query string for some reason. Closes https://github.com/gitlabhq/gitlabhq/issues/9881 See merge request !1983
| | * | | | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two issues: 1. The constraints in the resources were incorrect. Here's what it was before: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` In this case, id is actually the title of the milestone, which can be anything at the moment. After: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` 2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like: ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]): This change uses the babosa library to create a better slug, which surprisingly isn't actually used by the global milestone controllers. Instead, they use the title passed as a query string for some reason. Closes https://github.com/gitlabhq/gitlabhq/issues/9881 Fix constraints
| * | | | Merge branch 'issue_1156'Douwe Maan2015-12-071-25/+29
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Run custom Git hooks when creating or deleting branches through the UI. #1156Rubén Dávila2015-12-031-25/+29
| | |/ /
| * | | Merge branch 'link-refs' into 'master' Robert Speicher2015-12-047-43/+131
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recognize issue/MR/snippet/commit links as references. Fixes #3744 and #3745 See merge request !1933
| | * \ \ Merge branch 'master' into link-refsDouwe Maan2015-12-033-3/+8
| | |\ \ \ | | | |/ /
| | * | | Merge branch 'master' into link-refsDouwe Maan2015-12-024-10/+13
| | |\ \ \
| | * | | | Satisfy RubocopDouwe Maan2015-12-021-1/+1
| | | | | |
| | * | | | Fix referenced_mentionables method.Douwe Maan2015-12-011-1/+1
| | | | | |
| | * | | | Autolink first so we don't pick up numeric anchors as issue references.Douwe Maan2015-12-015-25/+10
| | | | | |
| | * | | | Render commit reference using short sha, but include full sha in comment.Douwe Maan2015-12-013-0/+20
| | | | | |
| | * | | | Fix code docsDouwe Maan2015-12-011-5/+2
| | | | | |
| | * | | | Fix specsDouwe Maan2015-11-301-3/+8
| | | | | |
| | * | | | Recognize commit range with named refs in compare URLs.Douwe Maan2015-11-301-12/+19
| | | | | |
| | * | | | Recognize issue/MR/snippet/commit links as references.Douwe Maan2015-11-306-12/+66
| | | | | |
| | * | | | Render commit range reference with short shas, link to full shas.Douwe Maan2015-11-301-25/+45
| | | | | |
| | * | | | Show local issues and MRs in "This X closes... / closed by..." sentenceDouwe Maan2015-11-301-1/+1
| | | | | |
| * | | | | Fix application settings cache not expiring after changesStan Hu2015-12-042-14/+9
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | cache_key is an instance method that relies on updated_at. When changes were made, the time-dependent key was being used instead of X.application_setting.last. Closes #3609
| * | | | Merge branch 'fork-event' into 'master' Robert Speicher2015-12-031-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't show project fork event as imported See merge request !1949
| | * \ \ \ Merge branch 'master' into fork-eventfork-eventDouwe Maan2015-12-033-3/+8
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Don't show project fork event as importedDouwe Maan2015-12-021-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'ui/issuable-filter' into 'master' Dmitriy Zaporozhets2015-12-032-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Issuable filter tweaks Depends on !1953 See the commits for more details, the messages mostly speak for themselves. # Highlights ## Filter bar Before: ![filter_before](/uploads/b061be7521c6d5babb77c7d12e77f65e/filter_before.png) After: ![filter_after](/uploads/aadfbcd77caf1b49fde8ca6d781f1004/filter_after.png) ## Bulk edit bar Before: ![bulk_before](/uploads/849c98224e1f335c65c0de5616bbcdae/bulk_before.png) After: ![bulk_after](/uploads/185d29116663f9f663acab76d328096f/bulk_after.png) See merge request !1963
| | * \ \ \ Merge branch 'master' into ui/issuable-filterDouwe Maan2015-12-033-3/+8
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Use "Any Label" and "Any Milestone" in selects rather than the ambiguous ↵Douwe Maan2015-12-022-4/+4
| | | |/ / | | |/| | | | | | | | | | | | "Any" option