summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-21/+62
|\
| * Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-107-50/+22
| |\
| * | Encode state as base64 stringKamil Trzcinski2016-05-091-4/+9
| * | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-21/+57
* | | Removed tracking of total method execution timestotal-method-timeYorick Peterse2016-05-121-2/+0
* | | Add a spec for `WikiLinkFilter`Timothy Andrew2016-05-121-3/+8
* | | Merge branch '17249-starred' into 'master' Robert Speicher2016-05-111-1/+1
|\ \ \
| * | | Restrict starred projects to viewable onesSean McGivern2016-05-101-1/+1
* | | | Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' into...Robert Speicher2016-05-111-3/+1
|\ \ \ \
| * | | | Only generate repository push email onceSean McGivern2016-05-111-3/+1
| | |_|/ | |/| |
* | | | Merge branch 'casecmp-cop' into 'master' Rémy Coutable2016-05-112-3/+3
|\ \ \ \
| * | | | Enable Rubocop Casecmp Performance Cop.Connor Shea2016-05-102-3/+3
| | |_|/ | |/| |
* | | | Merge branch 'string-replacement-cop' into 'master' Rémy Coutable2016-05-111-1/+1
|\ \ \ \
| * | | | Enable the StringReplacement cop.Connor Shea2016-05-101-1/+1
| |/ / /
* | | | Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master' Robert Speicher2016-05-105-176/+177
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix a few places where autoloading would failRémy Coutable2016-05-105-176/+177
* | | | Merge branch 'fix/using-uploads-in-global-snippets' into 'master' Robert Speicher2016-05-101-1/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Do not process upload links if no project contextGrzegorz Bizon2016-05-101-2/+6
| * | | Fix using link to uploads in global snippetsGrzegorz Bizon2016-05-101-1/+3
* | | | 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