summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update CHANGELOGsupport-akismetDouglas Barbosa Alexandre2016-02-021-1/+1
* Hide the link for spam logs if the Askimet is disabledDouglas Barbosa Alexandre2016-02-022-6/+11
* Memoize Akismet client initialization on AkismetHelperDouglas Barbosa Alexandre2016-02-021-2/+2
* Fix rubocop offensesDouglas Barbosa Alexandre2016-02-022-9/+10
* Refactor Admin::SpamLogsController to block user before destroyingDouglas Barbosa Alexandre2016-02-026-48/+46
* Refactor spam filtering on issues APIDouglas Barbosa Alexandre2016-02-022-10/+16
* Use time_ago_with_tooltip on spam logs listDouglas Barbosa Alexandre2016-02-021-1/+1
* Fix typo on User modelDouglas Barbosa Alexandre2016-02-022-1/+2
* Add model spec for SpamLogDouglas Barbosa Alexandre2016-02-021-0/+11
* Use truncate helper on spam logs listDouglas Barbosa Alexandre2016-02-024-15/+21
* Support Akismet spam checking for creation of issues via APIStan Hu2016-02-0231-7/+432
* Merge branch 'allow-@' into 'master' Douwe Maan2016-02-022-4/+12
|\
| * Allow "@" in file names and pathallow-@Jacob Vosmaer2016-02-012-4/+12
* | Merge branch 'generate-valid-message-id-for-email-rejections' into 'master' Douwe Maan2016-02-021-1/+1
|\ \
| * | Generate valid Message-ID in email rejection mailerWarren Guy2016-01-301-1/+1
* | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-02-021-1/+1
|\ \ \
| * | | Fix typo indentation in CI projects' APILouis Roché2016-01-221-1/+1
* | | | Merge branch 'rs-regression-issue-guidelines' into 'master' Dmitriy Zaporozhets2016-02-021-0/+20
|\ \ \ \
| * | | | Add notes about the regression issues to CONTRIBUTING.mdrs-regression-issue-guidelinesRobert Speicher2016-01-311-0/+20
* | | | | Merge branch 'expand-git-instrumentation' into 'master' Yorick Peterse2016-02-021-2/+14
|\ \ \ \ \
| * | | | | Instrument various Rugged constantsexpand-git-instrumentationYorick Peterse2016-02-011-0/+10
| * | | | | Instrument all Gitlab::Git instance methodsYorick Peterse2016-02-011-2/+4
* | | | | | Merge branch 'rs-relax-autosize' into 'master' Robert Speicher2016-02-015-3/+278
|\ \ \ \ \ \
| * | | | | | Allow manual resize of js-autosize textareasrs-relax-autosizeRobert Speicher2016-02-015-3/+278
|/ / / / / /
* | | | | | Update CHANGELOGRobert Speicher2016-02-011-1/+1
* | | | | | Merge branch 'merge-request-closes-issues-performance' into 'master'Robert Speicher2016-02-013-19/+12
|\ \ \ \ \ \
| * | | | | | Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performanceYorick Peterse2016-02-013-19/+12
* | | | | | | Merge branch 'stanhu/gitlab-ce-add-svg-support' into 'master' Dmitriy Zaporozhets2016-02-018-1/+75
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Render sanitized SVG imagesStan Hu2016-02-018-1/+75
|/ / / / / /
* | | | | | Merge branch 'take-guidelines-into-account-for-mrs' into 'master' Dmitriy Zaporozhets2016-02-011-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Link to Thoughtbot review guidelines.take-guidelines-into-account-for-mrsSytse Sijbrandij2016-01-301-0/+2
* | | | | | Merge branch 'rs-two-factor-casing' into 'master' Robert Speicher2016-02-014-6/+6
|\ \ \ \ \ \
| * | | | | | Make "Two-factor" casing consistent throughout the applicationrs-two-factor-casingRobert Speicher2016-01-314-6/+6
|/ / / / / /
* | | | | | Update CHANGELOGRobert Speicher2016-01-311-2/+6
* | | | | | Merge branch 'improve-gitlab-flow-doc' into 'master' Achilleas Pipinellis2016-01-311-3/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Improve GitLab flow documentation regarding the WIP merge requestsimprove-gitlab-flow-docRémy Coutable2016-01-291-3/+4
* | | | | | Merge branch 'rename-inline-diff' into 'master' Robert Speicher2016-01-3113-78/+206
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fewer html_safesrename-inline-diffDouwe Maan2016-01-301-2/+2
| * | | | | Fix specs and add a new oneDouwe Maan2016-01-302-28/+37
| * | | | | Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-2912-75/+194
* | | | | | Merge branch 'rs-issue-12706' into 'master' Douwe Maan2016-01-306-14/+14
|\ \ \ \ \ \
| * | | | | | Increase the minimum length for commit SHA matching to 7rs-issue-12706Robert Speicher2016-01-296-14/+14
* | | | | | | Merge branch 'cache-broadcast-message-current' into 'master' Dmitriy Zaporozhets2016-01-301-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Change ttl to 1 minutecache-broadcast-message-currentJosh Frye2016-01-291-1/+1
| * | | | | | | Cache BroadcastMessage.current for 5 minutes. Fixes #12770Josh Frye2016-01-291-1/+3
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'origin/background-delete-process'Dmitriy Zaporozhets2016-01-3011-9/+44
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update CHANGELOGbackground-delete-processJosh Frye2016-01-293-8/+6
| * | | | | | First pass at deleting projects in the background.Josh Frye2016-01-2911-12/+49
* | | | | | | Merge branch 'warn-admin-oauth' into 'master' Douwe Maan2016-01-302-1/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Improve text on warning messageZeger-Jan van de Weg2016-01-261-1/+3