Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'contributor-graph-by-email' into 'master' | Robert Speicher | 2015-11-17 | 1 | -3/+2 |
|\ | |||||
| * | Merge branch 'master' into contributor-graph-by-emailcontributor-graph-by-email | Douwe Maan | 2015-11-17 | 253 | -1132/+2253 |
| |\ | |||||
| * | | Fix grouping of contributors by email in graph. | Douwe Maan | 2015-10-29 | 1 | -3/+2 |
* | | | Merge branch 'adamliesko/gitlab-ce-notification-upon-unassignment' into 'mast... | Robert Speicher | 2015-11-17 | 1 | -4/+8 |
|\ \ \ | |||||
| * | | | Remove extra spaceadamliesko/gitlab-ce-notification-upon-unassignment | Douwe Maan | 2015-11-17 | 1 | -1/+1 |
| * | | | Don't fail when there was no previous assignee | Douwe Maan | 2015-11-17 | 1 | -8/+10 |
| * | | | Merge branch 'master' into adamliesko/gitlab-ce-notification-upon-unassignment | Douwe Maan | 2015-11-17 | 165 | -780/+1338 |
| |\ \ \ | |||||
| * | | | | Add notification to the former assignee upon unassignment | adamliesko | 2015-11-09 | 1 | -2/+4 |
* | | | | | Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master' | Robert Speicher | 2015-11-17 | 11 | -77/+122 |
|\ \ \ \ \ | |||||
| * | | | | | Use project member abilities more extensively | Douwe Maan | 2015-11-17 | 7 | -45/+49 |
| * | | | | | Refactor ability changes | Douwe Maan | 2015-11-17 | 5 | -71/+67 |
| * | | | | | Merge branch 'master' into james11/gitlab-ce-removable-group-owner | Douwe Maan | 2015-11-17 | 249 | -1130/+2235 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | fixing rubocop - random code not related to the changes | James Lopez | 2015-11-12 | 1 | -5/+9 |
| * | | | | | fixing rubocop indents | James Lopez | 2015-11-12 | 1 | -1/+2 |
| * | | | | | fixing rubocop indents | James Lopez | 2015-11-12 | 2 | -12/+14 |
| * | | | | | updated exception | James Lopez | 2015-11-11 | 1 | -1/+1 |
| * | | | | | refactored code as projects only have one owner. Kept some refactoring in pla... | James Lopez | 2015-11-11 | 4 | -40/+35 |
| * | | | | | refactored permissions and added update_project_member ability logic. Also re... | James Lopez | 2015-11-03 | 5 | -24/+57 |
| * | | | | | fix issue with adding members to project (spotted by test) | James Lopez | 2015-10-30 | 1 | -2/+11 |
| * | | | | | fixed last group owner issue and added test | James Lopez | 2015-10-29 | 1 | -4/+5 |
* | | | | | | Merge branch 'remove-code-duplication' | Dmitriy Zaporozhets | 2015-11-17 | 15 | -260/+242 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor similar code for Issue and MR update service | Dmitriy Zaporozhets | 2015-11-17 | 3 | -57/+53 |
| * | | | | | | Remove code duplication in notification_service.rb | Dmitriy Zaporozhets | 2015-11-17 | 1 | -28/+18 |
| * | | | | | | Remove duplication in mailers/emails/notes.rb | Dmitriy Zaporozhets | 2015-11-17 | 2 | -45/+52 |
| * | | | | | | Refactor duplciate code for groups_controller.rb and slack_service/note_messa... | Dmitriy Zaporozhets | 2015-11-17 | 6 | -50/+46 |
| * | | | | | | Remove duplication in diff_helper.rb | Dmitriy Zaporozhets | 2015-11-17 | 1 | -16/+16 |
| * | | | | | | Remove code duplication in gitlab_markdown_helper.rb | Dmitriy Zaporozhets | 2015-11-17 | 1 | -28/+24 |
| * | | | | | | Remove duplication in issue emails | Dmitriy Zaporozhets | 2015-11-16 | 1 | -36/+30 |
| * | | | | | | Refactor select2 tags | Dmitriy Zaporozhets | 2015-11-16 | 2 | -11/+14 |
* | | | | | | | Merge branch 'param-view' into 'master' | Robert Speicher | 2015-11-17 | 6 | -9/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Don't use params[:view] directly.param-view | Douwe Maan | 2015-11-17 | 6 | -9/+12 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Avoid render edit_form when visitor can't edit them. | Jason Lee | 2015-11-17 | 1 | -2/+1 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge branch 'rs-revert-gh-9820' into 'master' | Robert Speicher | 2015-11-17 | 5 | -16/+13 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820 | Robert Speicher | 2015-11-16 | 5 | -16/+13 |
* | | | | | | Merge branch 'issue/vars-need-eval' into 'master' | Douwe Maan | 2015-11-17 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Ensure variable is evalled | Gert Goet | 2015-10-29 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'rs-wiki-touches-project' into 'master' | Douwe Maan | 2015-11-17 | 1 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make ProjectWiki touch Project#last_activity_at after wiki actionsrs-wiki-touches-project | Robert Speicher | 2015-11-16 | 1 | -0/+10 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'http-to-https' into 'master' | Achilleas Pipinellis | 2015-11-17 | 2 | -4/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Rewrite HTTP links to force TLS, where possible | Alex Jordan | 2015-11-16 | 2 | -4/+4 |
* | | | | | | Merge branch 'global-milestones' into 'master' | Dmitriy Zaporozhets | 2015-11-16 | 24 | -186/+230 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Some code and doc improvementsglobal-milestones | Dmitriy Zaporozhets | 2015-11-16 | 3 | -2/+6 |
| * | | | | | Fix removing avatar for group | Dmitriy Zaporozhets | 2015-11-16 | 1 | -1/+1 |
| * | | | | | Group masters should be able to create/close milestones | Dmitriy Zaporozhets | 2015-11-16 | 5 | -7/+9 |
| * | | | | | Few changes to Group Milestone feature: | Dmitriy Zaporozhets | 2015-11-16 | 3 | -6/+5 |
| * | | | | | Add header and page title to new milestone page | Dmitriy Zaporozhets | 2015-11-16 | 1 | -0/+3 |
| * | | | | | Lets add more tests to Milestones services | Dmitriy Zaporozhets | 2015-11-16 | 1 | -1/+0 |
| * | | | | | Move global milestone specs | Dmitriy Zaporozhets | 2015-11-16 | 1 | -26/+0 |
| * | | | | | Fix a bug when milestone/label filter was empty for dashboard issues page | Dmitriy Zaporozhets | 2015-11-16 | 1 | -0/+5 |
| * | | | | | Refactor global and group milestones logic | Dmitriy Zaporozhets | 2015-11-16 | 19 | -165/+145 |