Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove helpers assigned_issuables_count and cached_assigned_issuables_countuassign_on_member_removing | Valery Sizov | 2017-04-20 | 1 | -10/+2 |
| | |||||
* | Remove assigned_(issues|merge_requests) methods from the issuable | Valery Sizov | 2017-04-18 | 1 | -1/+1 |
| | |||||
* | Using IssuablesFinder(s) for UI counters | Valery Sizov | 2017-04-18 | 1 | -1/+2 |
| | |||||
* | Merge branch 'use-avatars-in-activity-view' into 'master' | Douwe Maan | 2017-04-12 | 1 | -0/+28 |
|\ | | | | | | | | | Use avatars instead of icons in activity view See merge request !10596 | ||||
| * | Move event icons into events_helperuse-avatars-in-activity-view | Annabel Dunstone Gray | 2017-04-12 | 2 | -20/+30 |
| | | |||||
| * | Add helper for using avatars vs icons | Annabel Dunstone Gray | 2017-04-11 | 1 | -1/+14 |
| | | |||||
| * | Reuse system notes helper for profile event icons | Annabel Dunstone Gray | 2017-04-11 | 1 | -2/+7 |
| | | |||||
* | | Improve webpack-dev-server compatibility with non-localhost setups. | Mike Greiling | 2017-04-12 | 2 | -2/+33 |
| | | |||||
* | | Merge branch 'dm-outdated-diff-link' into 'master' | Sean McGivern | 2017-04-11 | 2 | -4/+17 |
|\ \ | | | | | | | | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572 | ||||
| * | | Fix specs | Douwe Maan | 2017-04-09 | 1 | -0/+2 |
| | | | |||||
| * | | Some code tweaks | Douwe Maan | 2017-04-08 | 1 | -1/+1 |
| | | | |||||
| * | | Fix views after rebase | Douwe Maan | 2017-04-08 | 1 | -2/+4 |
| | | | |||||
| * | | Fix specs and make tweaks | Douwe Maan | 2017-04-08 | 1 | -0/+2 |
| | | | |||||
| * | | Add link to diff header too | Douwe Maan | 2017-04-08 | 1 | -3/+10 |
| | | | |||||
* | | | Merge branch 'dz-fix-project-view' into 'master' | Annabel Dunstone Gray | 2017-04-11 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Change project view default for existing users and anonymous visitors to files+readme Closes #29926 See merge request !10498 | ||||
| * | | | Change project view default for existing users and anonymous visitors to ↵dz-fix-project-view | Dmitriy Zaporozhets | 2017-04-10 | 1 | -1/+5 |
| | |/ | |/| | | | | | | | | | | | | | files+readme Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Don't show 'Copy content' button on text files that are not rendered as text | Douwe Maan | 2017-04-10 | 1 | -0/+4 |
|/ / | |||||
* | | Remove the User#is_admin? method | blackst0ne | 2017-04-09 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-07 | 1 | -1/+1 |
|\ | |||||
| * | Update MR title change icon | Annabel Dunstone Gray | 2017-04-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 2 | -1/+9 |
|\ \ | |/ | |||||
| * | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' | Douwe Maan | 2017-04-07 | 2 | -1/+9 |
| |\ | | | | | | | | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356 | ||||
| | * | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 4 | -36/+48 |
| | |\ | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml | ||||
| | * \ | Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags | James Edwards-Jones | 2017-04-06 | 1 | -2/+18 |
| | |\ \ | |||||
| | * | | | Protected Tags backend review changes | James Edwards-Jones | 2017-04-06 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | Added changelog | ||||
| | * | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 11 | -17/+87 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss | ||||
| | * | | | | Moved Project#protected_branch? to ProtectedBranch, similar for tags | James Edwards-Jones | 2017-04-03 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Added ‘protected’ label and disabled delete button for tags index/show | James Edwards-Jones | 2017-03-31 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 3 | -6/+51 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '24784-mr-system-notes' into 'master' | Annabel Dunstone Gray | 2017-04-07 | 1 | -0/+26 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | View helpful system note in comment threads Closes #24784 See merge request !10503 | ||||
| | * | | | | | Fix icon name error24784-mr-system-notes | Annabel Dunstone Gray | 2017-04-06 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Rewrite system note helper | Annabel Dunstone Gray | 2017-04-06 | 1 | -39/+21 |
| | | | | | | | |||||
| | * | | | | | Change edit icon | Annabel Dunstone Gray | 2017-04-06 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Leave icon area blank if legacy note; remove diamond icon | Annabel Dunstone Gray | 2017-04-06 | 1 | -3/+1 |
| | | | | | | | |||||
| | * | | | | | Fix positioning of note icons | Annabel Dunstone Gray | 2017-04-06 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Fix newline errors | Annabel Dunstone Gray | 2017-04-06 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Add remaining system note icons | Annabel Dunstone Gray | 2017-04-06 | 1 | -3/+19 |
| | | | | | | | |||||
| | * | | | | | Add system notes icon helper; add icons | Annabel Dunstone Gray | 2017-04-06 | 1 | -0/+28 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'button-capitalization' into 'master' | Clement Ho | 2017-04-06 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Button capitalisation Closes #18931 See merge request !10418 | ||||
| | * | | | | Fixed button capitalisation for Projects in views | Jose Ivan Vargas Lopez | 2017-04-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Copy diff file path as GFM | Douwe Maan | 2017-04-06 | 2 | -5/+24 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-06 | 3 | -31/+24 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml | ||||
| * | | | | Linking to edit file directly | Eric Eastwood | 2017-04-06 | 1 | -17/+22 |
| | | | | | |||||
| * | | | | Merge branch '27262-issue-recent-searches' into 'master' | Jacob Schatz | 2017-04-06 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent search history for issues Closes #27262 See merge request !10324 | ||||
| | * | | | | Recent search history for issues | Eric Eastwood | 2017-04-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27262 | ||||
| * | | | | | Merge branch 'feature/enforce-2fa-per-group' into 'master' | Douwe Maan | 2017-04-06 | 1 | -12/+0 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Support 2FA requirement per-group See merge request !8763 | ||||
| | * | | | | Move AuthHelper#two_factor_skippable? into ApplicationController | Markus Koller | 2017-04-06 | 1 | -12/+0 |
| | | |_|/ | | |/| | | |||||
* | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-06 | 2 | -3/+22 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '28810-projectfinder-should-handle-more-options' into 'master' | Rémy Coutable | 2017-04-06 | 1 | -2/+18 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ProjectsFinder should handle more options Closes #28810 See merge request !9682 | ||||
| | * | | | ProjectsFinder should handle more options | Jacopo | 2017-04-06 | 1 | -2/+18 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extended ProjectFinder in order to handle the following options: - current_user - which user use - project_ids_relation: int[] - project ids to use - params: - trending: boolean - non_public: boolean - starred: boolean - sort: string - visibility_level: int - tags: string[] - personal: boolean - search: string - non_archived: boolean GroupProjectsFinder now inherits from ProjectsFinder. Changed the code in order to use the new available options. |