summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Removed unnecessary `id` from links and corrected tests to use the proper mat...9127-link-report-to-profilePatricio Cano2016-07-073-6/+5
* Added specs to check for the correct links.Patricio Cano2016-07-063-2/+33
* Link to the user's profile in the abuse reports and add a link to the admin a...Patricio Cano2016-07-062-2/+7
* Merge branch '15094-throttling-pushes_since_gc' into 'master' Douwe Maan2016-07-062-2/+9
|\
| * Throttle the update of `project.pushes_since_gc` to 1 minute15094-throttling-pushes_since_gcPaco Guzman2016-07-052-2/+9
* | Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into 'm...Douwe Maan2016-07-063-3/+34
|\ \
| * | Use a more future-proof check for Note/LegacyDiffNote19092-fix-event-for-legacydiffnote-not-considered-noteRémy Coutable2016-07-062-5/+5
| * | Fix diff comments not showing up in activity feedRémy Coutable2016-07-043-3/+34
* | | Merge branch 'shell-version-bump' into 'master' Douwe Maan2016-07-061-1/+1
|\ \ \
| * | | Bump GITLAB_SHELL_VERSION to 3.2.0shell-version-bumpPatricio Cano2016-07-051-1/+1
* | | | Merge branch 'gh-labels' into 'master' Robert Speicher2016-07-0611-54/+123
|\ \ \ \
| * | | | Fix unescaped strings in the labels dropdown templategh-labelsDouglas Barbosa Alexandre2016-07-061-2/+2
| * | | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-051-0/+1
| * | | | Render label name contains ?, & in the labels dropdown without escapingDouglas Barbosa Alexandre2016-07-052-6/+5
| * | | | Use CGI.unescapeHTML rather than doing the gsub with a mapDouglas Barbosa Alexandre2016-07-052-12/+2
| * | | | Move `unescape_html_entities` from LabelsHelper to Label modelDouglas Barbosa Alexandre2016-07-054-19/+13
| * | | | Render references for labels that name contains ?, or &Douglas Barbosa Alexandre2016-07-056-17/+77
| * | | | Allow '?', or '&' for label titlesDouglas Barbosa Alexandre2016-07-056-44/+69
| |/ / /
* | | | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-066-4/+156
|\ \ \ \
| * | | | refactor url validator to use sanitizer for checkfix/import-url-validatorJames Lopez2016-07-011-3/+1
| * | | | typoJames Lopez2016-06-301-1/+1
| * | | | few more changes from suggestionsJames Lopez2016-06-304-5/+4
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-30414-768/+1863
| |\ \ \ \
| * | | | | use class methodJames Lopez2016-06-301-7/+8
| * | | | | few changes based on feedbackJames Lopez2016-06-305-17/+20
| * | | | | fix merge conflictsJames Lopez2016-06-28279-1673/+4090
| |\ \ \ \ \
| * | | | | | added more info on how addressable URI differs from what we use in UrlValidatorJames Lopez2016-06-241-1/+3
| * | | | | | updated validator based on feedbackJames Lopez2016-06-231-3/+3
| * | | | | | fix chnagelogJames Lopez2016-06-221-2/+3
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-221-2/+5
| |\ \ \ \ \ \
| * | | | | | | another fix and fixed specJames Lopez2016-06-222-1/+10
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-22324-1798/+3805
| |\ \ \ \ \ \ \
| * | | | | | | | fix commentJames Lopez2016-06-201-1/+1
| * | | | | | | | fixed a few MySQL issues and added changelogJames Lopez2016-06-203-14/+46
| * | | | | | | | started working on a migration for projects that have current import_url issuesJames Lopez2016-06-202-7/+59
| * | | | | | | | fix addressable url validatorJames Lopez2016-06-201-7/+7
| * | | | | | | | Merge branches 'fix/import-url-validator' and 'master' of gitlab.com:gitlab-o...James Lopez2016-06-20268-1071/+11528
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fixing URL validation for import_url on projectsJames Lopez2016-06-173-3/+55
* | | | | | | | | | Merge branch 'update-templates-for-8-10' into 'master' Rémy Coutable2016-07-0625-24/+526
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add and update .gitignore & .gitlab-ci.yml templates for 8.10update-templates-for-8-10Rémy Coutable2016-07-0625-24/+526
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/project-export-error' into 'master' Rémy Coutable2016-07-064-3/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fix typofix/project-export-errorJames Lopez2016-07-061-1/+1
| * | | | | | | | | even more debugJames Lopez2016-07-063-3/+5
| * | | | | | | | | add more debug info to project exportJames Lopez2016-07-051-0/+4
* | | | | | | | | | Merge branch 'allow-disabling-of-git-access-protocol' into 'master' Douwe Maan2016-07-0529-37/+360
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use keyword arguments for boolean values and use `span` instead of `a` for cl...allow-disabling-of-git-access-protocolPatricio Cano2016-07-052-6/+6
| * | | | | | | | | | Revert back to not defining a default Git access protocol.Patricio Cano2016-07-056-6/+6
| * | | | | | | | | | Rebasing caused `enabled_git_access_protocol` to become plural. Fixed here.Patricio Cano2016-07-053-3/+3
| * | | | | | | | | | Clone button should not be clickable when there is a disabled protocolPatricio Cano2016-07-053-3/+13
| * | | | | | | | | | Default Git access protocol to `web`Patricio Cano2016-07-059-21/+15