summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-github-pull-requests-import' into 'master' Robert Speicher2016-01-201-9/+18
|\
| * Fix cross projects detection when importing GitHub pull requestsDouglas Barbosa Alexandre2016-01-201-9/+18
* | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-201-0/+68
|\ \ | |/
| * Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-201-0/+68
| |\
| | * Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-201-0/+68
* | | Use a MR with commits.Rubén Dávila2016-01-201-1/+1
* | | Merge branch 'master' into issue_3945Douwe Maan2016-01-202-4/+10
|\ \ \ | |/ /
| * | Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-201-0/+2
| |\ \
| | * \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into sentry-...Jeroen Nijhof2016-01-207-4/+207
| | |\ \ | | | |/
| | * | Add sentry integrationJeroen Nijhof2016-01-181-0/+2
| * | | Merge branch 'issue_3749' into 'master' Douwe Maan2016-01-201-4/+8
| |\ \ \ | | |_|/ | |/| |
| | * | Fix broken specs.issue_3749Rubén Dávila2016-01-191-4/+8
* | | | Update testsDouwe Maan2016-01-203-3/+3
* | | | Properly handle HTML entities with inline diffsDouwe Maan2016-01-202-5/+5
* | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-2011-9/+248
|\ \ \ \ | |/ / /
| * | | Merge branch 'add_email_headers' into 'master' Robert Speicher2016-01-191-2/+55
| |\ \ \
| | * | | Added X-GitLab-... headers to emails from CI and Email On Push servicesAnton Baklanov2016-01-191-2/+55
| * | | | Merge branch 'user-ldap-email' into 'master' Robert Speicher2016-01-191-1/+27
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into user-ldap-emailDouwe Maan2016-01-191-0/+1
| | |\ \ \ \ | | | |/ / /
| | * | | | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-191-1/+27
| * | | | | Merge branch 'add-public-param-to-project-api' into 'master' Dmitriy Zaporozhets2016-01-191-0/+23
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add specs. Adjust filter.Josh Frye2016-01-191-0/+23
| | |/ / /
| * | | | Fix creator should be added as a master of the project on creationDouglas Barbosa Alexandre2016-01-191-0/+1
| |/ / /
| * | | Merge branch 'fix-consider-re-assign-as-a-mention'Douwe Maan2016-01-191-1/+57
| |\ \ \
| | * | | This will ensure previous assignee gets an email even if his notif level is "...fix-consider-re-assign-as-a-mentionRémy Coutable2016-01-151-0/+40
| | * | | Consider re-assign as a mention from a notification point of viewRémy Coutable2016-01-151-1/+17
| * | | | Update build artifacts metadata fixture to 0.0.2Grzegorz Bizon2016-01-181-0/+0
| | |/ / | |/| |
| * | | Ensure Gravatar host looks like an actual hostfix-gravator-default-urlRémy Coutable2016-01-181-0/+44
| | |/ | |/|
| * | Use a more sensible message for the AbuseReport uniqueness validationrs-abuse-report-validationRobert Speicher2016-01-161-1/+1
| * | Merge branch 'ci/build_dependencies' into 'master' Douwe Maan2016-01-153-4/+40
| |\ \ | | |/ | |/|
| | * Change dependencies.builds to depends_on_buildsKamil Trzcinski2016-01-151-2/+2
| | * Let the CI runner know about builds that this build depends onci/build_dependenciesKamil Trzcinski2016-01-143-4/+40
* | | Move parallel diff logic to separate classDouwe Maan2016-01-202-18/+22
* | | Add missing specsDouwe Maan2016-01-191-0/+21
* | | Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-193-123/+101
* | | Add testsDouwe Maan2016-01-152-0/+42
* | | Merge branch 'master' into issue_3945Rubén Dávila2016-01-14102-848/+3081
|\ \ \ | |/ /
| * | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-1423-39/+849
| |\ \ | | |/
| | * Merge branch 'ci/api-builds' into 'master' Douwe Maan2016-01-142-0/+183
| | |\
| | | * Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1414-75/+581
| | | |\
| | | * | Remove hard-coded id from builds factoryTomasz Maczukin2016-01-141-2/+1
| | | * | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1312-57/+120
| | | |\ \
| | | * | | Add seperated 'describe' block for build trace specsTomasz Maczukin2016-01-131-7/+13
| | | * | | Change :ci_build_canceled factory to :canceled traitTomasz Maczukin2016-01-132-5/+5
| | | * | | Add some fixes after reviewTomasz Maczukin2016-01-131-0/+6
| | | * | | Fix :ci_build_with_trace factoryTomasz Maczukin2016-01-111-1/+3
| | | * | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1146-252/+1029
| | | |\ \ \
| | | * | | | Change commit builds URL in builds APITomasz Maczukin2016-01-111-3/+3
| | | * | | | Add some modifications to builds API and specsTomasz Maczukin2016-01-081-4/+4
| | | * | | | Change test access level from MASTER to DEVELOPERTomasz Maczukin2016-01-081-1/+1