summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Ensure empty recipients are rejected in BuildsEmailServiceRémy Coutable2016-04-061-2/+22
* | | | | | API: Ability to retrieve a single tagRobert Schilling2016-04-061-0/+17
|/ / / / /
* | | | | Merge branch 'fix-project-path-rename' into 'master' Stan Hu2016-04-051-0/+22
|\ \ \ \ \
| * | | | | Fix Error 500 after renaming a project pathStan Hu2016-04-051-0/+22
* | | | | | Merge branch 'rs-fix-gmail-actions' into 'master' Robert Speicher2016-04-051-0/+2
|\ \ \ \ \ \
| * | | | | | Premailer shouldn't remove script tags from our emailsRobert Speicher2016-04-051-0/+2
* | | | | | | Merge branch 'close-issue-bug' into 'master' Jacob Schatz2016-04-051-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update issue_spec testclose-issue-bugAnnabel Dunstone2016-04-051-3/+3
* | | | | | | Merge branch 'note-form-design' into 'master' Jacob Schatz2016-04-053-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Updated testsPhil Hughes2016-04-041-1/+1
| * | | | | | Tests updatePhil Hughes2016-04-043-3/+3
* | | | | | | Merge branch 'fix/permissions-when-importing-members' into 'master' Douwe Maan2016-04-051-0/+49
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Respond 404 when unauthorized user imports membersfix/permissions-when-importing-membersGrzegorz Bizon2016-04-051-2/+2
| * | | | | | Do not leak project exists when importing membersGrzegorz Bizon2016-04-051-2/+2
| * | | | | | Check permissions when importing project membersGrzegorz Bizon2016-04-051-0/+49
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'reorder-language' into 'master' Yorick Peterse2016-04-051-4/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update language only on HEAD of the repositoryreorder-languageKamil Trzcinski2016-04-051-4/+14
* | | | | | Merge branch 'fix-gh-pr-import' into 'master' Yorick Peterse2016-04-052-0/+31
|\ \ \ \ \ \
| * | | | | | Flush repository cache before import project datafix-gh-pr-importDouglas Barbosa Alexandre2016-04-042-0/+31
| | |_|_|_|/ | |/| | | |
* | | | | | Wrap images in discussions and wikis with a link to the image source using Im...connorshea2016-04-042-1/+25
|/ / / / /
* | | | | Reload forked_project_link projectsYorick Peterse2016-04-041-0/+5
* | | | | Merge branch 'fix_remove_fork_link' into 'master' Douwe Maan2016-04-041-0/+32
|\ \ \ \ \
| * | | | | Fix rubocop in unlink fork service specsBaldinof2016-04-031-2/+2
| * | | | | Move unlink fork logic to a serviceBaldinof2016-03-222-19/+32
| * | | | | Merge branch 'master' into fix_remove_fork_linkBaldinof2016-03-1435-458/+789
| |\ \ \ \ \
| * | | | | | Close merge requests when removing fork relationBaldinof2016-03-111-0/+19
* | | | | | | Merge branch 'update_repository_from_ee' into 'master' Douwe Maan2016-04-042-4/+23
|\ \ \ \ \ \ \
| * | | | | | | Migrate Repository#local_branches from gitlab-ee.update_repository_from_eeRubén Dávila2016-04-012-4/+23
| | |_|_|_|/ / | |/| | | | |