| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'decouple-member-notification' into 'master' | Douwe Maan | 2016-04-12 | 1 | -28/+9 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple membership and notifications This allow you to have notification setting per project even if you are member of group. It also creates background for having notification settings in project you are not member of. - [x] Make it work - [x] Migrations - [x] CHANGELOG - [x] More tests - [x] API For #3359 After this merge request there is still some work to be done: * create migration that remove duplicates in notification settings table and create uniq index (8.8 probably) * remove notification_level field from Member model in 9.0 * make proper API for notification settings * use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) * maybe more tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3421 | ||||
| | * | Merge branch 'master' into decouple-member-notification | Douglas Barbosa Alexandre | 2016-04-11 | 2 | -7/+46 |
| | |\ | |||||
| | * | | Refactor notification helper and fix notification service | Dmitriy Zaporozhets | 2016-03-30 | 1 | -28/+9 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Merge branch 'issue_1752' into 'master' | Robert Speicher | 2016-04-11 | 1 | -4/+19 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Fix milestone removal problem when editing issues fixes #1752 See merge request !3571 | ||||
| | * | | improve specs code syntaxissue_1752 | Felipe Artur | 2016-04-07 | 1 | -11/+11 |
| | | | | |||||
| | * | | Fix milestone removal problem when editing issues | Felipe Artur | 2016-04-06 | 1 | -0/+15 |
| | |/ | |||||
| * | | Merge branch 'rs-form_errors' into 'master' | Dmitriy Zaporozhets | 2016-04-11 | 1 | -0/+46 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize the way we check for and display form errors - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard. See merge request !3531 | ||||
| | * | | Standardize the way we check for and display form errorsrs-form_errors | Robert Speicher | 2016-04-04 | 1 | -0/+46 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard. | ||||
| * | | Remove `random_markdown_tip` helperrs-remove-markdown-tips | Robert Speicher | 2016-04-09 | 1 | -7/+0 |
| |/ | | | | Only usage got removed in !3442 | ||||
| * | Implementing 'Groups View' and 'TODOs View' as options for dashboard ↵ | Elias Werberich | 2016-03-24 | 1 | -1/+3 |
| | | | | | | | preferences. Fixes #14585. | ||||
| * | Merge branch 'master' into issue_12658 | Douwe Maan | 2016-03-21 | 2 | -3/+22 |
| |\ | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb | ||||
| | * | change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltip | Arinde Eniola | 2016-03-20 | 1 | -3/+3 |
| | | | |||||
| | * | Make HTTP(s) label consistent on clone bar | Stan Hu | 2016-03-19 | 1 | -0/+19 |
| | | | | | | | | | | | Sites that use http:// for the external_url should always display HTTP on the clone bar. Similarly, sites that use https:// should show HTTPS. | ||||
| * | | Fix specs | Douwe Maan | 2016-03-20 | 1 | -9/+1 |
| | | | |||||
| * | | Tweaks, refactoring, and specs | Douwe Maan | 2016-03-20 | 1 | -15/+0 |
| | | | |||||
| * | | Merge branch 'master' into issue_12658 | Douwe Maan | 2016-03-20 | 1 | -2/+10 |
| |\ \ | |/ | |||||
| | * | Fix specslabel-tooltip | Rémy Coutable | 2016-03-18 | 1 | -2/+10 |
| | | | |||||
| * | | Improve group visibility level feature | Zeger-Jan van de Weg | 2016-03-18 | 1 | -7/+2 |
| | | | |||||
| * | | Merge 4009-external-users into issue_12658 | Felipe Artur | 2016-03-16 | 1 | -3/+3 |
| |\ \ | |/ | |||||
| | * | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-cropping | Rémy Coutable | 2016-03-15 | 1 | -3/+3 |
| | | | | | | | | | | | This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282. | ||||
| * | | Add permission level to groups | Felipe Artur | 2016-03-10 | 2 | -0/+23 |
| |/ | |||||
| * | Make better use of the `visibility_level` factory traitsrs-traits-are-good | Robert Speicher | 2016-03-08 | 1 | -3/+3 |
| | | |||||
| * | Use Gitlab::Git::DiffCollections | Jacob Vosmaer | 2016-03-03 | 1 | -54/+3 |
| | | |||||
| * | Add `:with_avatar` trait to User factory | Robert Speicher | 2016-02-24 | 1 | -3/+3 |
| | | |||||
| * | Merge branch 'rs-emoji' into 'master' | Douwe Maan | 2016-02-19 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | -----  |  See merge request !2800 | ||||
| | * | Fix specs expecting `emoji/` in image path | Robert Speicher | 2016-02-13 | 1 | -1/+1 |
| | | | |||||
| * | | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docs | Ben Boeckel | 2016-02-12 | 1 | -0/+4 |
| |/ | | | | | | | | - Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533. | ||||
| * | Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-links | Rémy Coutable | 2016-02-04 | 1 | -18/+15 |
| | | | | | | | You can set type: :merge_request to create a link to merge request lists instead of issues list. Accept both Symbol & String as type argument for the link_to_label helper | ||||
| * | Fix broken tests | Dmitriy Zaporozhets | 2016-02-04 | 1 | -2/+2 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix specs and add a new one | Douwe Maan | 2016-01-30 | 1 | -4/+13 |
| | | |||||
| * | Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677 | Robert Speicher | 2016-01-24 | 1 | -0/+5 |
| | | | | | Closes #12677 | ||||
| * | Move parallel diff logic to separate class | Douwe Maan | 2016-01-20 | 1 | -18/+0 |
| | | |||||
| * | Refactor Gitlab::Highlight and fix tests | Douwe Maan | 2016-01-19 | 1 | -30/+33 |
| | | |||||
| * | Merge branch 'master' into issue_3945 | Rubén Dávila | 2016-01-14 | 5 | -65/+80 |
| |\ | |||||
| | * | Use the WikiPipeline when rendering the wiki markdown content | Douglas Barbosa Alexandre | 2016-01-14 | 1 | -2/+3 |
| | | | |||||
| | * | Move `BroadcastMessage#status` to a helper since it's presentational | Robert Speicher | 2016-01-13 | 1 | -0/+20 |
| | | | |||||
| | * | Update broadcast_message helper | Robert Speicher | 2016-01-13 | 1 | -12/+30 |
| | | | | | | | | | | | Now it returns the fully-formatted message so we can be consistent about how it's shown. | ||||
| | * | Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversion | Robert Speicher | 2016-01-12 | 1 | -0/+4 |
| | | | | | | | | | | | Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge. | ||||
| | * | Add two custom Date/Time conversion formats | Robert Speicher | 2016-01-07 | 1 | -4/+4 |
| | | | |||||
| | * | Don't override issue page description in project layout. | Douwe Maan | 2016-01-06 | 1 | -4/+2 |
| | | | |||||
| | * | Make `page_description` less magical :sparkles: | Robert Speicher | 2016-01-05 | 1 | -25/+2 |
| | | | |||||
| | * | Use `User#avatar_url` instead of `avatar_icon` helper | Robert Speicher | 2016-01-05 | 1 | -35/+16 |
| | | | |||||
| | * | Merge branch 'master' into more-opengraph | Douwe Maan | 2016-01-05 | 2 | -1/+8 |
| | |\ | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml | ||||
| | | * | remove public field from namespace and refactoringnamespace-clean_up | Valery Sizov | 2016-01-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | Use `assign` instead of `instance_variable_set` | Robert Speicher | 2015-12-27 | 1 | -7/+7 |
| | | | | |||||
| | * | | Add specs for page_image using a Group's avatar | Robert Speicher | 2015-12-27 | 1 | -0/+16 |
| | | | | |||||
| * | | | More refactoring from last code review. #3945 | Rubén Dávila | 2016-01-14 | 1 | -10/+14 |
| | | | | | | | | | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs | ||||
| * | | | Fix broken specs. #3945 | Rubén Dávila | 2016-01-08 | 1 | -8/+9 |
| | | | | |||||
| * | | | Fix broken specs. #3945 | Rubén Dávila | 2016-01-08 | 1 | -1/+2 |
| | | | | |||||
| * | | | Fix broken spec and small refactor. #3945 | Rubén Dávila | 2015-12-30 | 1 | -29/+1 |
| | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |