summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-036-0/+140
|\
| * Fix rubocop offensesDouglas Barbosa Alexandre2016-02-022-9/+10
| * Refactor Admin::SpamLogsController to block user before destroyingDouglas Barbosa Alexandre2016-02-022-21/+28
| * Refactor spam filtering on issues APIDouglas Barbosa Alexandre2016-02-021-3/+8
| * Fix typo on User modelDouglas Barbosa Alexandre2016-02-021-0/+1
| * Add model spec for SpamLogDouglas Barbosa Alexandre2016-02-021-0/+11
| * Use truncate helper on spam logs listDouglas Barbosa Alexandre2016-02-021-0/+4
| * Support Akismet spam checking for creation of issues via APIStan Hu2016-02-024-0/+111
* | Merge branch 'title-projects-dropdown' into 'master' Jacob Schatz2016-02-024-1/+74
|\ \
| * | added feature testPhil Hughes2016-01-301-1/+20
| * | added testsPhil Hughes2016-01-303-0/+54
* | | Add a spec for the API pagination Link headerRémy Coutable2016-02-021-3/+3
| |/ |/|
* | Merge branch 'allow-@' into 'master' Douwe Maan2016-02-021-0/+8
|\ \
| * | Allow "@" in file names and pathallow-@Jacob Vosmaer2016-02-011-0/+8
* | | Allow manual resize of js-autosize textareasrs-relax-autosizeRobert Speicher2016-02-011-0/+11
* | | Merge branch 'merge-request-closes-issues-performance' into 'master'Robert Speicher2016-02-011-15/+7
|\ \ \
| * | | Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performanceYorick Peterse2016-02-011-15/+7
* | | | Render sanitized SVG imagesStan Hu2016-02-011-0/+27
| |/ / |/| |
* | | Merge branch 'rename-inline-diff' into 'master' Robert Speicher2016-01-315-31/+103
|\ \ \ | |_|/ |/| |
| * | 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-294-28/+91
* | | Merge branch 'rs-issue-12706' into 'master' Douwe Maan2016-01-303-8/+8
|\ \ \
| * | | Increase the minimum length for commit SHA matching to 7rs-issue-12706Robert Speicher2016-01-293-8/+8
* | | | Merge remote-tracking branch 'origin/background-delete-process'Dmitriy Zaporozhets2016-01-301-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | First pass at deleting projects in the background.Josh Frye2016-01-291-3/+3
* | | | Fix old version warning when viewing wiki latest version via version_idfix-viewing-wiki-page-lastest-version-via-version-idDouglas Barbosa Alexandre2016-01-291-0/+32
|/ / /
* | | Merge branch 'note-background-job' into 'master' Dmitriy Zaporozhets2016-01-292-3/+27
|\ \ \ | |/ / |/| |
| * | Fix Rubocop errornote-background-jobJosh Frye2016-01-281-3/+3
| * | Update testsJosh Frye2016-01-282-3/+27
* | | Merge branch 'rs-remove-ip-blocking' into 'master' Dmitriy Zaporozhets2016-01-291-68/+0
|\ \ \
| * | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-281-68/+0
* | | | Merge branch 'rs-transient-capybara-timeout' into 'master' Dmitriy Zaporozhets2016-01-292-1/+22
|\ \ \ \
| * | | | Prevent transient Capybara timeouts during feature testsrs-transient-capybara-timeoutRobert Speicher2016-01-282-1/+22
| |/ / /
* | | | Merge branch 'hotfix/ruby-21-broken-update' into 'master' Marin Jankovski2016-01-291-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-...James Lopez2016-01-282-33/+33
| |\ \ \ | | |/ /
| * | | trick rubocop and temporarily add ruby 2.1 images for any branchJames Lopez2016-01-281-6/+6
| | |/ | |/|
* | | Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-281-1/+1
|\ \ \
| * \ \ Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-285-32/+40
| |\ \ \ | | |/ /
| * | | Fix specsDouwe Maan2016-01-281-1/+1
* | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-282-14/+24
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into highlight-blameDouwe Maan2016-01-285-32/+40
| |\ \ \ | | | |/ | | |/|
| * | | Move blame group logic to dedicated classDouwe Maan2016-01-282-14/+24
| | |/ | |/|
* | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-281-2/+2
|\ \ \
| * | | Fix broken specs. #2406Rubén Dávila2016-01-201-2/+2
* | | | Improve consistency and duplication for Merge Request APIimprove-mr-apiDmitriy Zaporozhets2016-01-281-31/+31
| |_|/ |/| |
* | | Merge branch 'update-ruby-2.2.4' into 'master' Douwe Maan2016-01-271-6/+6
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4James Lopez2016-01-2712-55/+449
| |\ \ \ | | | |/ | | |/|
| * | | fix rubocop new 2.2 syntax issuesJames Lopez2016-01-251-6/+6
* | | | Merge branch 'events-performance' into 'master' Robert Speicher2016-01-271-21/+0
|\ \ \ \
| * | | | Use Atom update times of the first eventevents-performanceYorick Peterse2016-01-271-21/+0