summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '14400-diff-redesign' into 'master' Jacob Schatz2016-04-091-1/+1
|\
| * Diff design updatesAnnabel Dunstone2016-04-071-1/+1
| * Update diff colors and iconsAnnabel Dunstone2016-04-071-1/+1
* | Instrument Rails cache codeinstrument-rails-cacheYorick Peterse2016-04-081-0/+71
|/
* Merge branch 'issue_14012' into 'master' Rémy Coutable2016-04-071-0/+6
|\
| * Implement review suggestionsFelipe Artur2016-04-071-1/+1
| * Improve codeFelipe Artur2016-04-051-1/+1
| * Fix problem when creating milestones in groups without projectsFelipe Artur2016-04-051-0/+6
* | Merge branch 'regex-for-colons' into 'master' Douwe Maan2016-04-071-0/+115
|\ \
| * | Remove dumb debug statement and add many tests.Jacob Schatz2016-04-071-0/+115
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqGrzegorz Bizon2016-04-071-0/+101
|\ \ \ | |/ / |/| |
| * | Merge branch 'fix/2fa-authentication-spoofing' into 'master' Rémy Coutable2016-04-071-0/+101
| |\ \
| | * | Make sessions controller specs more explicitGrzegorz Bizon2016-04-071-4/+5
| | * | Fix 2FA authentication spoofing vulnerabilityGrzegorz Bizon2016-04-071-35/+42
| | * | Add specs for sessions controller including 2FAGrzegorz Bizon2016-04-061-0/+93
* | | | Merge branch 'fix-project-404-cache-issue' into 'master' Yorick Peterse2016-04-071-0/+13
|\ \ \ \
| * | | | Expire caches after project creation to ensure a consistent stateStan Hu2016-04-071-0/+13
* | | | | Merge branch 'update_main_lang_if_unset' into 'master' Rémy Coutable2016-04-071-5/+21
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Only update main language if it is not already setupdate_main_lang_if_unsetDrew Blessing2016-04-061-5/+21
| | |/ / | |/| |
* | | | Merge branch 'api-filter-milestone' into 'master' Rémy Coutable2016-04-071-0/+19
|\ \ \ \
| * | | | Improve coding and doc styleRobert Schilling2016-04-061-3/+5
| * | | | API: Ability to filter milestones by stateRobert Schilling2016-04-061-0/+17
* | | | | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-072-1/+66
|\ \ \ \ \
| * | | | | Add feature specs for list of badges pageGrzegorz Bizon2016-04-061-0/+34
| * | | | | Extend build status badge, add html/markdown methodsGrzegorz Bizon2016-04-061-1/+32
| |/ / / /
* | | | | Merge branch 'fix_14638' into 'master' Rémy Coutable2016-04-071-0/+23
|\ \ \ \ \
| * | | | | Fixes #14638.PotHix2016-04-061-0/+23
* | | | | | Return status code 303 after a branch DELETE operation to avoid project deletionStan Hu2016-04-061-0/+14
| |_|_|/ / |/| | | |
* | | | | Merge branch 'saml-external-groups' into 'master' Robert Speicher2016-04-071-99/+67
|\ \ \ \ \
| * | | | | Implemented suggested fixesPatricio Cano2016-04-061-25/+16
| * | | | | Fix error that was causing only one group to be returned and corrected specs ...Patricio Cano2016-04-061-1/+6
| * | | | | Removed extra LDAP tests and added tests for the external groups featurePatricio Cano2016-04-051-22/+46
| * | | | | Remove unnecessary LDAP tests from SAML testsPatricio Cano2016-04-041-59/+7
* | | | | | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-074-11/+15
|\ \ \ \ \ \
| * | | | | | little refactor and improvements on specsGabriel Mazetto2016-04-062-7/+4
| * | | | | | Ensure correct filter order to validate with our markdown specpatch/fix-markdown-preview-wikisGabriel Mazetto2016-04-061-1/+1
| * | | | | | Fix a few edited references from WikiLinkFilter and specsGabriel Mazetto2016-04-062-4/+6
| * | | | | | Fixed WikiPipeline and specsGabriel Mazetto2016-04-061-3/+6
| * | | | | | Fixed Gollum pages link url expansion to render correctly in previewGabriel Mazetto2016-03-301-3/+5
* | | | | | | Merge branch 'patch/fix-ldap-unblock-user-logic' into 'master' Robert Speicher2016-04-061-1/+26
|\ \ \ \ \ \ \
| * | | | | | | Unblocks user when active_directory is disabled and it can be foundpatch/fix-ldap-unblock-user-logicGabriel Mazetto2016-04-051-1/+26
| |/ / / / / /
* | | | | | | Merge branch 'fix-markdown-rendering' into 'master' Douwe Maan2016-04-061-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix header link rendering when containing numbersfix-markdown-renderingYorick Peterse2016-04-061-0/+8
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Revert "API: Ability to retrieve a single tag"Robert Schilling2016-04-061-17/+0
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'fix_missing_filters_on_status_tab_change' into 'master' Jacob Schatz2016-04-061-0/+119
|\ \ \ \ \ \
| * | | | | | complete the testsfix_missing_filters_on_status_tab_changeArinde Eniola2016-04-061-1/+75
| * | | | | | set up test for preventing this issue from reoccuringArinde Eniola2016-04-061-0/+45
* | | | | | | Merge branch 'metrics-measure-block' into 'master' Robert Speicher2016-04-061-3/+44
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Measure Ruby blocks using Gitlab::MetricsYorick Peterse2016-04-061-0/+41
| * | | | | | Corrected some spec headers for Gitlab::MetricsYorick Peterse2016-04-061-3/+3
| | |_|_|_|/ | |/| | | |
View Lorry Controller Status