summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wik...Stan Hu2016-07-161-3/+11
|\
| * Fix a bug where the project's repository path was returned instead of the wik...19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wikiAlejandro Rodríguez2016-07-151-3/+11
* | Merge branch 'syntax-highlight-unknown-language' into 'master' Robert Speicher2016-07-161-7/+27
|\ \ | |/ |/|
| * Don't fail to highlight when Rouge doesn't have a lexerDouwe Maan2016-07-151-7/+27
* | Merge branch 'legacy-diff-notes-are-dumb' into 'master' Douwe Maan2016-07-151-4/+4
|\ \
| * | Update testslegacy-diff-notes-are-dumbDouwe Maan2016-07-151-4/+4
| |/
* | Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6Douwe Maan2016-07-152-3/+4
|/
* Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-155-34/+20
|\
| * use %(...) and %[...] in favor of %<...>feature.rouge-20http://jneen.net/2016-07-141-1/+1
| * expect final newlines from the banzai filterhttp://jneen.net/2016-07-141-1/+1
| * stub out errors from the formatterhttp://jneen.net/2016-07-141-1/+1
| * don't expect a random newline at the end of the thing?http://jneen.net/2016-07-141-1/+1
| * don't expect &quot; encoding anymorehttp://jneen.net/2016-07-141-6/+6
| * remove uses of the nowrap: featurehttp://jneen.net/2016-07-141-9/+9
| * rm spec for a deleted methodhttp://jneen.net/2016-07-141-14/+0
| * apparently this gets encoded now?http://jneen.net/2016-07-141-1/+1
| * we no longer encode double-quoteshttp://jneen.net/2016-07-141-3/+3
* | Merge branch '17341-firefox-u2f' into 'master' Robert Speicher2016-07-154-16/+47
|\ \
| * | Add a U2F feature spec for multiple devices owned by the same user.17341-firefox-u2fTimothy Andrew2016-07-141-11/+44
| * | Use a single challenge for U2F authentication.Timothy Andrew2016-07-143-5/+3
* | | Merge branch 'kradydal/gitlab-ce-create-todos-when-issue-author-assigne-or-me...Douwe Maan2016-07-151-15/+20
|\ \ \
| * | | When Issue author assign or mention himself Todos are createdKatarzyna Kobierska2016-07-141-15/+20
* | | | Merge branch 'fix/project-export-filename' into 'master' Douwe Maan2016-07-151-0/+21
|\ \ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-exp...fix/project-export-filenameJames Lopez2016-07-152-0/+12
| |\ \ \ \
| * | | | | add project name and namespace to filename on project exportJames Lopez2016-07-151-0/+21
* | | | | | Merge branch 'fix-mentioned-users-on-diff-notes' into 'master' Douwe Maan2016-07-151-0/+18
|\ \ \ \ \ \
| * | | | | | Fix mentioned users list on diff notesDouglas Barbosa Alexandre2016-07-151-0/+18
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-creating-group-with-space-in-group-path'Douwe Maan2016-07-151-4/+16
|\ \ \ \ \ \
| * | | | | | Fix creating group with space in group pathDouglas Barbosa Alexandre2016-07-141-4/+16
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix/ee-to-ce-import'Douwe Maan2016-07-151-0/+1
|\ \ \ \ \ \
| * | | | | | fix EE => CE project import, and updated JSON specJames Lopez2016-07-141-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'revert-lock-for-issuable' into 'master' Robert Speicher2016-07-152-22/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuableStan Hu2016-07-132-22/+0
| |/ / / /
* | | | | Merge branch 'disable-statement-timeout' into 'master' Robert Speicher2016-07-151-0/+4
|\ \ \ \ \
| * | | | | Fix spec Don't attempt to disable statement timeout on a MySQL DBdisable-statement-timeoutStan Hu2016-07-141-0/+4
| |/ / / /
* | | | | Merge branch 'fix/import-issues-last-updated' into 'master' Robert Speicher2016-07-151-0/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix updated_at not preserved after import - for GitLab projectsJames Lopez2016-07-141-0/+8
| |/ / /
* | | | Merge branch 'update-branch-names-in-gc' into 'master' Jacob Vosmaer (GitLab)2016-07-151-1/+4
|\ \ \ \
| * | | | Refresh branch cache after `git gc`Stan Hu2016-07-131-1/+4
* | | | | Merge branch 'gl-dropdown-issuable-form' into 'master' Jacob Schatz2016-07-152-4/+3
|\ \ \ \ \
| * | | | | Updated testsPhil Hughes2016-07-072-4/+3
* | | | | | Merge branch 'compare-dropdowns' into 'master' Jacob Schatz2016-07-151-0/+42
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fixed submit button not enablingcompare-dropdownsPhil Hughes2016-07-081-1/+1
| * | | | | Added tests for compare dropdownsPhil Hughes2016-07-081-0/+42
* | | | | | Merge branch 'fix/persistent-import-data' into 'master' Fatih Acet2016-07-141-2/+20
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/persistent-...James Lopez2016-07-1363-328/+625
| |\ \ \ \ \
| * | | | | | fixes a few issues to do with import_url not being saved correctly for import...James Lopez2016-07-121-2/+20
* | | | | | | Merge branch 'fix-label-reference-filter' into 'master' Robert Speicher2016-07-131-11/+99
|\ \ \ \ \ \ \
| * | | | | | | Fix markdown rendering for label references that contains `.`Douglas Barbosa Alexandre2016-07-131-13/+13
| * | | | | | | Fix markdown rendering for label references that begin with a digitDouglas Barbosa Alexandre2016-07-131-0/+48
View Lorry Controller Status