summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1147-171/+681
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-103-45/+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-101-44/+0
| | |\ \ | | | |/ | | |/|
| | | * Remove the annotate rake taskJeroen van Baarsen2016-05-101-44/+0
| | * | Links for redmine issue references are generated correctly againBenedikt Huss2016-05-101-0/+3
| * | | Use a case-insensitive comparison in sanitizing URI schemesStan Hu2016-05-091-1/+1
| |/ /
| * | Merge branch 'cascade_drop' into 'master' Robert Speicher2016-05-091-1/+3
| |\ \ | | |/ | |/|
| | * Add if exists to drop commandDrew Blessing2016-05-091-1/+3
| * | Expose MergeRequest#user_notes_count in the API and use the method in issues ...Rémy Coutable2016-05-091-1/+1
| * | API: Expose Issue#user_notes_countcnam-dep2016-05-091-1/+1
| * | Use the proper GitLab URL for links in WikiArtem Sidorenko2016-05-091-1/+1
| * | Improve multiple branch push performance by memoizing permission checkingStan Hu2016-05-091-1/+6
| * | Update SVG sanitizer to conform to SVG 1.1Stan Hu2016-05-062-0/+144
| * | Merge branch 'annotate-models' into 'master' Douwe Maan2016-05-061-0/+44
| |\ \
| | * | Auto annotate models on migrationannotate-modelsZeger-Jan van de Weg2016-05-061-0/+44
| * | | Merge branch 'cascade_drop' into 'master' Robert Speicher2016-05-061-1/+4
| |\ \ \ | | | |/ | | |/|
| | * | Rake drop tables with cascadeDrew Blessing2016-05-031-1/+4
| * | | Merge branch 'fix/import-url-issues' into 'master' Robert Speicher2016-05-051-1/+1
| |\ \ \
| | * | | fix var errorJames Lopez2016-04-271-1/+1
| * | | | Fix passing nil to protected_tag?tag-existsYorick Peterse2016-05-051-1/+1
| * | | | Use tag_exists? in GitAccess#protected_tag?Yorick Peterse2016-05-051-1/+1
| * | | | Fix the line code when importing PR review comments from GitHubDouglas Barbosa Alexandre2016-05-051-4/+17
| | |_|/ | |/| |
| * | | Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable2016-05-041-18/+0
| |\ \ \
| | * | | Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_ta...Rémy Coutable2016-05-041-18/+0
| | | |/ | | |/|
| * | | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-043-2/+24
| |\ \ \ | | |/ / | |/| |
| | * | API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-293-2/+24
| | |/
| * | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-022-6/+19
| |\ \
| | * \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-04-262-6/+19
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '15579-filter-milestone-confidential-issues-api' into 'master' Robert Speicher2016-04-261-1/+9
| | | |\
| | | | * Filter confidential issues from milestones API if user does not have accessStan Hu2016-04-251-1/+9
| | | * | Merge branch 'fix-private-snippet-api' into 'master' Robert Speicher2016-04-251-5/+10
| | | |\ \
| | | | * | Prevent private snippets in public/internal projects from being leaked via APIStan Hu2016-04-251-5/+10
| | | | |/
| * | | | Properly handle bigger filesZeger-Jan van de Weg2016-04-281-4/+9
| * | | | Replace gitlab-workhorse with GitLab Workhorse where appropriateinitd_gitlab_workhorse_renameAchilleas Pipinellis2016-04-281-6/+6
| * | | | Merge branch 'use-remote-ip-for-akismet' into 'master' Rémy Coutable2016-04-282-4/+12
| |\ \ \ \
| | * | | | Use ActionDispatch Remote IP for Akismet checkingStan Hu2016-04-272-4/+12
| | |/ / /
| * | | | Backport GitHub Enterprise import support from EEStan Hu2016-04-261-4/+11
| |/ / /
| * | | Merge branch 'emoji-unicode-fix' into 'master' Jacob Schatz2016-04-251-0/+4
| |\ \ \
| | * | | Removed usage of normilizeEmojiName methodemoji-unicode-fixPhil Hughes2016-04-221-2/+1
| | * | | Fixes issue with emoji comments not showing correct emoji imagePhil Hughes2016-04-221-0/+5
| * | | | Merge branch 'issue_14904' into 'master' Jacob Schatz2016-04-251-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-215-41/+40
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-203-1/+11
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2016-40/+289
| | |\ \ \ \ \
| | * | | | | | Add shortcut_path to GonHelper moduleAlfredo Sumaran2016-04-181-0/+1
| * | | | | | | Merge branch 'rs-503-page' into 'master' Dmitriy Zaporozhets2016-04-252-2/+4
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Add a branded 503 static error pagers-503-pageRobert Speicher2016-04-222-2/+4
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'fix-project-hook-delete-permissions' into 'master' Rémy Coutable2016-04-251-2/+2
| |\ \ \ \ \ \