summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Implement top navigation concept for profile areaDmitriy Zaporozhets2016-04-1916-22/+33
* Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-1913-79/+180
|\
| * Add support to cherry-pick any commitP.S.V.R2016-04-1813-79/+180
* | Merge branch 'mr-formatting' into 'master' Robert Speicher2016-04-1917-19/+19
|\ \
| * | format merge request references properlyBen Bodenmiller2016-04-1817-19/+19
* | | Merge branch '14566-confidential-issue-branches' into 'master' Robert Speicher2016-04-192-8/+15
|\ \ \
| * | | A new branch created for a confidential issue is named `<id>-confidential-iss...14566-confidential-issue-branchesTimothy Andrew2016-04-191-1/+1
| * | | Remove unused variable in `IssuesController`.Timothy Andrew2016-04-181-2/+0
| * | | Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-br...Timothy Andrew2016-04-1585-291/+695
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-br...Timothy Andrew2016-04-1358-360/+533
| |\ \ \ \
| * | | | | Refactor `Issue#related_branches`Timothy Andrew2016-04-122-4/+11
| * | | | | Sanitize branch names for confidential issues.Timothy Andrew2016-04-121-1/+5
* | | | | | Merge branch 'toggle-points-per-packet' into 'master' Rémy Coutable2016-04-192-2/+10
|\ \ \ \ \ \
| * | | | | | Configuring of points per UDP packettoggle-points-per-packetYorick Peterse2016-04-192-2/+10
* | | | | | | Merge branch 'rs-issue-15126' into 'master' Douwe Maan2016-04-193-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Remove additional misuse of `data-original-title` attributeRobert Speicher2016-04-182-2/+2
| * | | | | | | Remove persistent XSS vulnerability in `commit_person_link` helperRobert Speicher2016-04-171-1/+1
* | | | | | | | Merge branch 'profile-aside-toggle' into 'master' Jacob Schatz2016-04-191-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed aside toggle on profile pagesprofile-aside-togglePhil Hughes2016-04-181-2/+0
* | | | | | | | | Merge branch 'dropdown-filter-after-load' into 'master' Jacob Schatz2016-04-192-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Trigger filtering after ajax is complete in dropdowndropdown-filter-after-loadPhil Hughes2016-04-192-0/+4
* | | | | | | | | Merge branch 'configurable-shared-runners-text' into 'master' Kamil Trzciński2016-04-194-3/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use different markdownconfigurable-shared-runners-textKamil Trzcinski2016-04-191-1/+1
| * | | | | | | | | Add configurable shared runners textKamil Trzcinski2016-04-184-3/+15
* | | | | | | | | | Merge branch 'fix/link-group-permissions' into 'master' Douwe Maan2016-04-191-4/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use guard clause to check ability to share projectGrzegorz Bizon2016-04-191-7/+4
| * | | | | | | | | | Refactor method that shares project with a groupGrzegorz Bizon2016-04-191-4/+3
| * | | | | | | | | | Check permissions when sharing project with groupGrzegorz Bizon2016-04-191-4/+10
* | | | | | | | | | | Merge branch 'dz/system-hooks-ui' into 'master' Dmitriy Zaporozhets2016-04-193-13/+36
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add push events to permit params in system hooksdz/system-hooks-uiDmitriy Zaporozhets2016-04-191-1/+1
| * | | | | | | | | | Allow enable/disable push events for system hooksDmitriy Zaporozhets2016-04-192-12/+35
* | | | | | | | | | | Merge branch 'feature/system_hook_push' into 'master' Dmitriy Zaporozhets2016-04-198-31/+49
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | moving overlapping scopes to webhookGabriel Mazetto2016-04-193-5/+3
| * | | | | | | | | | Using single builder for push and tag eventsGabriel Mazetto2016-04-192-2/+2
| * | | | | | | | | | Refactor GitTagPushService and fig tags_push system event hookGabriel Mazetto2016-04-192-16/+15
| * | | | | | | | | | Added System Hooks for push and tag_pushGabriel Mazetto2016-04-195-15/+36
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'auto-fsck-skip-wiki' into 'master' Yorick Peterse2016-04-194-4/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Improve 'auto fsck' admin emailsJacob Vosmaer2016-04-183-1/+7
| * | | | | | | | | When a project wiki is disabled skip it for fsckJacob Vosmaer2016-04-181-3/+3
* | | | | | | | | | Merge branch 'gh-keep-issues-prs-references' into 'master' Robert Speicher2016-04-181-4/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use GitHub Issue/PR number as iid to keep referencesDouglas Barbosa Alexandre2016-04-181-4/+6
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dropdown-filter-select' into 'master' Jacob Schatz2016-04-181-8/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed issue with multi select not working with arrow keysdropdown-filter-selectPhil Hughes2016-04-181-8/+2
* | | | | | | | | | | Merge branch '645-profile-update-bug' into 'master' Jacob Schatz2016-04-181-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add null check to formData.append645-profile-update-bugAnnabel Dunstone2016-04-181-2/+3
* | | | | | | | | | | | Merge branch 'change_target_branch_link_color' into 'master' Jacob Schatz2016-04-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | change the link color of the target branch in a merge rquestchange_target_branch_link_colorArinde Eniola2016-04-181-1/+2
* | | | | | | | | | | | | Merge branch 'mobile-header-overlap' into 'master' Jacob Schatz2016-04-181-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed overlap in header on mobilemobile-header-overlapPhil Hughes2016-04-181-1/+5
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'dropzone-class-remove' into 'master' Jacob Schatz2016-04-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \