summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-11425-3880/+4382
|\
| * Change dashboard button color to white on hoverDmitriy Zaporozhets2016-05-101-0/+4
| * Minor consistency fixes to sidebar & headerDmitriy Zaporozhets2016-05-102-2/+2
| * Merge branch 'mobile-navigation-redesign' into 'master' Dmitriy Zaporozhets2016-05-108-9/+108
| |\
| | * Fix media queries for absolutely positioned nav elementAnnabel Dunstone2016-05-093-4/+14
| | * Hide navbar on mobileAnnabel Dunstone2016-05-097-6/+95
| * | Merge branch '2460-3690-support-multiline-tag-message' into 'master' Rémy Coutable2016-05-102-6/+4
| |\ \
| | * | Add integration specs for tagsRémy Coutable2016-05-101-1/+0
| | * | Replace text field with textarea in 'New Tag' view and display tag message in...Calin Seciu2016-05-102-5/+4
| * | | Merge branch 'revert-4026' into 'master' Rémy Coutable2016-05-101-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Revert "Merge branch 'wiki-fix' into 'master' "Rémy Coutable2016-05-101-1/+1
| * | | Merge branch 'remove-annotate-gem' into 'master' Yorick Peterse2016-05-1081-1653/+0
| |\ \ \ | | |/ / | |/| |
| | * | Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-0981-1653/+0
| * | | Merge branch 'fix/todos-for-private-group-mentions' into 'master' Douwe Maan2016-05-091-2/+2
| |\ \ \
| | * | | Fix adding a todo for private group membersAhmad Sherif2016-05-071-2/+2
| * | | | Merge branch 'issue_15394' into 'master' Rémy Coutable2016-05-092-0/+8
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Make model sanitization methods one linersFelipe Artur2016-05-092-6/+4
| | * | | Sanitize milestones and label titlesissue_15394Felipe Artur2016-05-052-0/+10
| * | | | Merge branch '2954-api-expose-issue-user_notes_count' into 'master' Rémy Coutable2016-05-093-20/+12
| |\ \ \ \
| | * | | | Expose MergeRequest#user_notes_count in the API and use the method in issues ...Rémy Coutable2016-05-092-20/+8
| | * | | | API: Expose Issue#user_notes_countcnam-dep2016-05-091-0/+4
| | | |_|/ | | |/| |
| * | | | Merge branch 'rs-backport-ee-372' into 'master' Rémy Coutable2016-05-091-1/+2
| |\ \ \ \
| | * | | | Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372Robert Speicher2016-05-041-1/+2
| | | |/ / | | |/| |
| * | | | Merge branch 'fix-secret' into 'master' Rémy Coutable2016-05-091-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Don't read otp_secret_encryption_key from hardcoded path in models/userJakub Jirutka2016-05-041-1/+1
| * | | | Merge branch 'wiki-fix' into 'master' Rémy Coutable2016-05-091-1/+1
| |\ \ \ \
| | * | | | Use the proper GitLab URL for links in WikiArtem Sidorenko2016-05-091-1/+1
| * | | | | Merge branch 'rs-remove-wall_enabled' into 'master' Dmitriy Zaporozhets2016-05-091-2/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove `wall_enabled` field from Projectrs-remove-wall_enabledRobert Speicher2016-05-081-2/+0
| * | | | | Improve multiple branch push performance by memoizing permission checkingStan Hu2016-05-091-1/+1
| * | | | | Merge branch 'escape-commit-titles' into 'master' Robert Speicher2016-05-081-1/+5
| |\ \ \ \ \
| | * | | | | Escape HTML in commit titles in system note messagesStan Hu2016-05-071-1/+5
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'fix-build-notification-on-merge-page-change' into 'master' Stan Hu2016-05-082-10/+6
| |\ \ \ \ \
| | * | | | | Fix build notification on merge request page change even if the build status ...Benedikt Huss2016-05-082-10/+6
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'fix-sanitize-svg' into 'master' Robert Speicher2016-05-071-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Update SVG sanitizer to conform to SVG 1.1Stan Hu2016-05-061-1/+1
| | |/ / /
| * | | | Reduce delay in destroying a project from 1-minute to immediatelyStan Hu2016-05-072-3/+8
| |/ / /
| * | | Make group settings button white instead of gray for better visibilitydz-improve-group-settingsDmitriy Zaporozhets2016-05-061-1/+1
| * | | Merge branch 'nice-todos-bell' into 'master' Dmitriy Zaporozhets2016-05-063-1/+10
| |\ \ \
| | * | | Add nice new Todo bellnice-todos-bellJacob Schatz2016-05-063-1/+10
| * | | | Merge branch 'dz-refactor-group-subnav' into 'master' Dmitriy Zaporozhets2016-05-062-40/+21
| |\ \ \ \
| | * | | | Move group settings navigation to own partialdz-refactor-group-subnavDmitriy Zaporozhets2016-05-062-40/+21
| | |/ / /
| * | | | Merge branch '17343-a-tag-code' into 'master' Jacob Schatz2016-05-061-0/+5
| |\ \ \ \
| | * | | | Align code within links in comments17343-a-tag-codeAnnabel Dunstone2016-05-061-0/+5
| * | | | | Annotate modelsDmitriy Zaporozhets2016-05-065-2/+6
| | |/ / / | |/| | |
| * | | | Merge branch 'group-navigation-redesign' into 'master' Dmitriy Zaporozhets2016-05-0623-65/+181
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove duplicate cover-control mobile stylesgroup-navigation-redesignAnnabel Dunstone2016-05-051-12/+0
| | * | | Fix group settings dropdown for group members and visitorsDmitriy Zaporozhets2016-05-051-15/+15
| | * | | Remove group rss icon since it depends on context and duplciates on other pagesDmitriy Zaporozhets2016-05-051-3/+0
| | * | | Remove mobile styles; horizontally scroll layout nav linksAnnabel Dunstone2016-05-051-19/+3