Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs-empty_project-helpers' into 'master' | Rémy Coutable | 2017-01-26 | 14 | -40/+41 |
|\ | |||||
| * | Use `:empty_project` where possible in helper specsrs-empty_project-helpers | Robert Speicher | 2017-01-25 | 14 | -40/+41 |
* | | Merge branch 'rs-empty_project-controllers' into 'master' | Rémy Coutable | 2017-01-26 | 43 | -74/+67 |
|\ \ | |||||
| * | | Use `empty_project` where possible in controller specsrs-empty_project-controllers | Robert Speicher | 2017-01-25 | 43 | -74/+67 |
| |/ | |||||
* | | Use `:empty_project` where possible in finder specsrs-empty_project-finders | Robert Speicher | 2017-01-25 | 10 | -23/+23 |
* | | Merge branch 'fix/26518' into 'master' | Douwe Maan | 2017-01-25 | 1 | -0/+22 |
|\ \ | |||||
| * | | Fix access to the wiki code via HTTP when repository feature disabled | Douglas Barbosa Alexandre | 2017-01-25 | 1 | -0/+22 |
* | | | Merge branch 'copy-as-md' into 'master' | Jacob Schatz | 2017-01-25 | 3 | -13/+448 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into copy-as-md | Douwe Maan | 2017-01-25 | 29 | -74/+603 |
| |\ \ \ | | |/ / | |||||
| * | | | Run tests in a single browser session | Douwe Maan | 2017-01-24 | 1 | -66/+81 |
| * | | | Merge branch 'master' into copy-as-md | Douwe Maan | 2017-01-24 | 90 | -470/+2116 |
| |\ \ \ | |||||
| * | | | | Improve handling of code blocks containing triple backticks | Douwe Maan | 2017-01-19 | 1 | -1/+11 |
| * | | | | Improve support for linebreaks, tables and nested blockquotes in lists | Douwe Maan | 2017-01-19 | 1 | -7/+22 |
| * | | | | Merge branch 'master' into copy-as-md | Douwe Maan | 2017-01-19 | 126 | -657/+2978 |
| |\ \ \ \ | |||||
| * | | | | | Properly copy/paste allowed HTML | Douwe Maan | 2017-01-19 | 1 | -0/+31 |
| * | | | | | Satisfy Rubocop | Douwe Maan | 2017-01-18 | 1 | -2/+0 |
| * | | | | | Move some functions to utils | Douwe Maan | 2017-01-18 | 1 | -2/+2 |
| * | | | | | Add more SyntaxHighlightFilter and MathFilter tests | Douwe Maan | 2017-01-17 | 1 | -16/+141 |
| * | | | | | Fix ShortcutsIssuable#replyWithSelectedText tests | Douwe Maan | 2017-01-17 | 1 | -9/+12 |
| * | | | | | Fix SyntaxHighlightFilter spec | Douwe Maan | 2017-01-17 | 1 | -4/+4 |
| * | | | | | Improve spec | Douwe Maan | 2017-01-16 | 1 | -151/+155 |
| * | | | | | Copying a rendered issue/comment will paste into GFM textareas as actual GFM | Douwe Maan | 2017-01-16 | 1 | -0/+234 |
* | | | | | | Merge branch 'refresh-authorizations-fork-join' into 'master' | Douwe Maan | 2017-01-25 | 8 | -1/+135 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-join | Yorick Peterse | 2017-01-25 | 8 | -1/+135 |
* | | | | | | | Merge branch 'label-select-toggle' into 'master' kamil-test-branch | Fatih Acet | 2017-01-25 | 1 | -0/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed label select toggle not updating correctlylabel-select-toggle | Phil Hughes | 2017-01-16 | 1 | -0/+16 |
* | | | | | | | | Merge branch '26775-fix-auto-complete-initial-loading' into 'master' | Fatih Acet | 2017-01-25 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix autocomplete initial undefined state26775-fix-auto-complete-initial-loading | Eric Eastwood | 2017-01-23 | 1 | -0/+26 |
* | | | | | | | | | Merge branch 'fix-ci-requests-concurrency' into 'master' | Grzegorz Bizon | 2017-01-25 | 2 | -1/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Return struct instead of multiple values | Kamil Trzcinski | 2017-01-25 | 1 | -1/+1 |
| * | | | | | | | | | Add 409 conflict testsfix-ci-requests-concurrency | Kamil Trzcinski | 2017-01-25 | 1 | -0/+14 |
| * | | | | | | | | | Fix specs | Kamil Trzcinski | 2017-01-25 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' | Grzegorz Bizon | 2017-01-25 | 5 | -29/+85 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Remove unneeded code and fix offensesbackport-ee-changes-for-build-minutes | Kamil Trzcinski | 2017-01-25 | 1 | -47/+0 |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui... | Kamil Trzcinski | 2017-01-24 | 51 | -262/+1558 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_... | Kamil Trzcinski | 2017-01-20 | 6 | -29/+132 |
* | | | | | | | | | Merge branch 'fix/cycle-analytics-spec-failure' into 'master' | Rémy Coutable | 2017-01-25 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix spec failure due to timestamp ordering issue in mySQL | James Lopez | 2017-01-25 | 1 | -1/+6 |
* | | | | | | | | | | Merge branch 'dz-fix-group-canonical-route' into 'master' | Dmitriy Zaporozhets | 2017-01-25 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix 500 error for Group#web_url method if nested groupdz-fix-group-canonical-route | Dmitriy Zaporozhets | 2017-01-24 | 1 | -0/+6 |
* | | | | | | | | | | | Merge branch 'dz-nested-groups-access-improvements' into 'master' | Dmitriy Zaporozhets | 2017-01-25 | 4 | -7/+66 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add User#nested_groups and User#nested_projects methods | Dmitriy Zaporozhets | 2017-01-25 | 2 | -0/+43 |
| * | | | | | | | | | | | Refactor Namespace code related to nested groups | Dmitriy Zaporozhets | 2017-01-13 | 2 | -7/+23 |
* | | | | | | | | | | | | Merge branch 'issue-fiter-test-failure' into 'master' | Rémy Coutable | 2017-01-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fixed error with filter keyboard tests | Phil Hughes | 2017-01-25 | 1 | -1/+1 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'tc-only-mr-button-if-allowed' into 'master' | Sean McGivern | 2017-01-25 | 1 | -0/+108 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Test there is no Merge Request button when MRs are disabled | Toon Claes | 2017-01-25 | 1 | -0/+14 |
| * | | | | | | | | | | | | Ensure the correct Merge Request button is found | Toon Claes | 2017-01-25 | 1 | -6/+14 |
| * | | | | | | | | | | | | Deduplicate tests for Merge Request buttons | Toon Claes | 2017-01-23 | 4 | -186/+86 |
| * | | | | | | | | | | | | Only show Merge Request button when user can create a MR | Toon Claes | 2017-01-20 | 3 | -0/+186 |