summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-add-cohort-spec' into 'master' Sean McGivern2017-04-271-0/+15
|\
| * Increase code coverage for admin/cohorts pagedz-add-cohort-specDmitriy Zaporozhets2017-04-271-0/+15
* | Remove unused codeFilipa Lacerda2017-04-271-0/+64
* | Use vue files for vue components.Filipa Lacerda2017-04-272-2/+7
* | Merge branch 'tc-make-user-master-project-by-admin' into 'master' Rémy Coutable2017-04-271-0/+16
|\ \
| * | Make namespace owner master of project upon creationtc-make-user-master-project-by-adminToon Claes2017-04-271-0/+16
| |/
* | Merge branch '26585-remove-readme-view-caching' into 'master' Douwe Maan2017-04-278-57/+34
|\ \
| * | Remove the unnecessary ApplicationSetting stubbingToon Claes2017-04-271-1/+0
| * | Remove unused optional parameter `asciidoc_opts`Toon Claes2017-04-271-19/+2
| * | Fix failing specsToon Claes2017-04-272-2/+2
| * | Refactor MarkupHelperDouwe Maan2017-04-271-10/+10
| * | Cache the rendered README, but post-process on showToon Claes2017-04-273-31/+28
| * | Move some methods from ApplicationHelper to MarkupHelperToon Claes2017-04-271-2/+0
| * | Rename GitlabMarkdownHelper -> MarkupHelperToon Claes2017-04-274-4/+4
| |/
* | Merge branch '29505-allow-admins-sudo-to-blocked-users' into 'master' Rémy Coutable2017-04-271-1/+27
|\ \ | |/ |/|
| * Allow admins to sudo to blocked users.29505-allow-admins-sudo-to-blocked-usersTimothy Andrew2017-04-261-1/+27
* | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'Sean McGivern2017-04-274-5/+38
|\ \
| * | Fix rendering emoji inside a stringblackst0ne2017-04-254-5/+38
* | | Add button to delete filters from filtered search barClement Ho2017-04-264-7/+81
* | | Merge branch 'gl-version-backup-file' into 'master' Rémy Coutable2017-04-261-1/+1
|\ \ \
| * | | Fix failing specgl-version-backup-fileAchilleas Pipinellis2017-04-261-1/+1
* | | | Resolve "Jobs dropdown in mini graph should close when we receive an error"Filipa Lacerda2017-04-262-46/+75
* | | | Submodule Dockerfile templatesZeger-Jan van de Weg2017-04-261-0/+6
* | | | Use rspec-set to speed up examplesZeger-Jan van de Weg2017-04-263-34/+40
* | | | Merge branch 'backport-md-cache-fix' into 'master' Dmitriy Zaporozhets2017-04-261-2/+2
|\ \ \ \
| * | | | Fix a failing specNick Thomas2017-04-251-2/+2
* | | | | Merge branch '26509-show-update-time' into 'master' Annabel Dunstone Gray2017-04-261-1/+1
|\ \ \ \ \
| * | | | | Add updated time to project listJeff Stubler2017-04-211-1/+1
* | | | | | Merge branch '22826-ui-inconsistency-different-files-views-find-file-button-m...Clement Ho2017-04-261-0/+30
|\ \ \ \ \ \
| * | | | | | [#22826] Add newline before expect in accordance to four phase thoughtbot styleTM Lee2017-04-251-0/+2
| * | | | | | [#22826] Ensure find_file_link and download button is part of file tree headerTM Lee2017-04-231-0/+28
* | | | | | | Merge branch '12910-personal-snippet-prep-2' into 'master' Sean McGivern2017-04-263-0/+38
|\ \ \ \ \ \ \
| * | | | | | | Support preview_markdown action for personal_snippetsJarka Kadlecova2017-04-263-0/+38
* | | | | | | | Load a project's CI status in batch from redisBob Van Landuyt2017-04-263-21/+148
* | | | | | | | Merge branch '26437-closed-by' into 'master' Rémy Coutable2017-04-263-1/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Add issues/:iid/closed_by api endpointmhasbini2017-04-123-1/+42
* | | | | | | | | Merge branch 'more-mr-filters' into 'master' Sean McGivern2017-04-261-4/+68
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ability to filter merge requests by labels and milestonesRobert Schilling2017-04-251-4/+68
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'group-assignee-dropdown-send-group-id' into 'master' Filipa Lacerda2017-04-261-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Assignee filter on group issues/merge requests only loads group usersgroup-assignee-dropdown-send-group-idPhil Hughes2017-04-241-0/+16
* | | | | | | | | | Merge branch '20378-natural-sort-issue-numbers' into 'master'Sean McGivern2017-04-262-5/+94
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change issues sentence to use natural sortingJeff Stubler2017-04-252-5/+94
* | | | | | | | | | | Merge branch '31280-skip-issueables-without-project' into 'master' Sean McGivern2017-04-262-25/+56
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Follow feedback on the reviewLin Jen-Shin2017-04-261-23/+47
| * | | | | | | | | | | Skip issuable without a project in IssuableExtractor#extractLin Jen-Shin2017-04-252-55/+62
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Ensures that OAuth/LDAP/SAML users don't need to be confirmedRémy Coutable2017-04-263-0/+41
* | | | | | | | | | | Merge branch 'mr-diff-size-overflow' into 'master' Douwe Maan2017-04-252-18/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Show correct size when MR diff overflowsSean McGivern2017-04-252-18/+34
* | | | | | | | | | | | Merge branch 'dm-fix-oauth-user-creation' into 'master' Robert Speicher2017-04-253-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creationDouwe Maan2017-04-243-0/+38