summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '14995-custom_wiki_sidebar' into 'master'Sean McGivern2018-07-172-4/+58
|\
| * So we still want to have More Pages buttonLin Jen-Shin2018-07-171-1/+1
| * Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-1626-196/+409
| |\
| * \ Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-13833-6250/+10446
| |\ \
| * \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into 14995-c...Andreas Kämmerle2018-07-02123-1571/+2814
| |\ \ \
| * | | | There's no point to test customized sidebar with empty wikiLin Jen-Shin2018-06-271-10/+0
| * | | | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-06-271657-35820/+71805
| |\ \ \ \
| * | | | | Introduce #find_sidebar and use a constant to find the page14995-custom_wiki_sidebarLin Jen-Shin2018-03-261-0/+16
| * | | | | Rearrange the tests and add another case whereLin Jen-Shin2018-03-261-15/+27
| * | | | | Add test for sidebar and cleanup wiki testsLin Jen-Shin2018-03-231-3/+38
* | | | | | Merge branch 'feature/gb/email-delivery-metrics' into 'master'Sean McGivern2018-07-174-4/+41
|\ \ \ \ \ \
| * | | | | | Update notification specs after renaming a classGrzegorz Bizon2018-07-161-2/+4
| * | | | | | Implement action mailer delivery metrics observerGrzegorz Bizon2018-07-161-0/+35
| * | | | | | Move existing email interceptors into the same moduleGrzegorz Bizon2018-07-162-2/+2
* | | | | | | Merge branch 'fix-project-api-archived' into 'master'Rémy Coutable2018-07-161-0/+33
|\ \ \ \ \ \ \
| * | | | | | | Fix archived parameter for projects APIMarko, Peter2018-07-161-0/+33
* | | | | | | | Merge branch '49291-fix-memory-graph-component-typo' into 'master'Filipa Lacerda2018-07-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix `transform` typoKushal Pandya2018-07-161-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '49061-submodule-helper-fix' into 'master'Sean McGivern2018-07-161-13/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | SubmoduleHelper - Project is not always available as an instance variable49061-submodule-helper-fixMario de la Ossa2018-07-151-13/+8
* | | | | | | | Merge branch 'update-issue-closing-pattern' into 'master'Rémy Coutable2018-07-161-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Add tests for non-comma-separated issue numbers in single line messageGeorge Tsiolis2018-07-111-0/+14
* | | | | | | | | Remove Repository#lookup and unreachable rugged codeJacob Vosmaer (GitLab)2018-07-163-91/+11
* | | | | | | | | Merge branch '48745-project-exports-fail-when-uploads-have-been-migrated-to-o...Sean McGivern2018-07-165-2/+100
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use fileuploader dynamic path method in uploads manager and add spec48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storageJames Lopez2018-07-132-2/+11
| * | | | | | | | | update saver spec to use the old uploads codeJames Lopez2018-07-121-0/+1
| * | | | | | | | | added changelog, small refactorJames Lopez2018-07-112-4/+0
| * | | | | | | | | refactor uploads managerJames Lopez2018-07-111-2/+2
| * | | | | | | | | fix specsJames Lopez2018-07-111-4/+25
| * | | | | | | | | update uploads saverJames Lopez2018-07-102-2/+9
| * | | | | | | | | Fix avatar saver and specJames Lopez2018-07-101-0/+3
| * | | | | | | | | add more object storage specsJames Lopez2018-07-101-2/+23
| * | | | | | | | | add upload manager and specJames Lopez2018-07-101-0/+40
* | | | | | | | | | Merge branch 'fix/gb/rename-environments-stop-actions' into 'master'Kamil Trzciński2018-07-164-29/+20
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove unused `stop_action?` method from deployment classfix/gb/rename-environments-stop-actionsGrzegorz Bizon2018-07-121-18/+0
| * | | | | | | | | Rename environments stop action methodGrzegorz Bizon2018-07-123-11/+20
* | | | | | | | | | Merge branch '49128-improve-log-output-of-jasmine-toequal' into 'master'Mike Greiling2018-07-131-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | improve log output of jasmine `toEqual` with nested objects/arrays49128-improve-log-output-of-jasmine-toequalLukas Eipert2018-07-111-1/+10
* | | | | | | | | | | Merge branch '48673-lazy-load-performance-bar-in-frontend' into 'master'Mike Greiling2018-07-132-60/+84
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Lazy-load performance bar UI48673-lazy-load-performance-bar-in-frontendSean McGivern2018-07-132-60/+84
* | | | | | | | | | | Merge branch 'ide-merge-requests-forks' into 'master'Filipa Lacerda2018-07-136-7/+118
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixed test to correctly text relative URLside-merge-requests-forksPhil Hughes2018-07-131-7/+27
| * | | | | | | | | | | fixed karma specsPhil Hughes2018-07-121-2/+9
| * | | | | | | | | | | Allow collaboration with forks through the APIBob Van Landuyt2018-07-122-2/+67
| * | | | | | | | | | | Allow merge requests from forks to be opened in Web IDEPhil Hughes2018-07-123-0/+19
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/gb/fix-project-settings-build-time-validation' into 'master'Kamil Trzciński2018-07-131-6/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve project build time setting validationGrzegorz Bizon2018-07-121-6/+8
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-fix-stderr-pipe-consumption' into 'master'Yorick Peterse2018-07-132-0/+43
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Avoid process deadlock in popen by consuming input pipessh-fix-stderr-pipe-consumptionStan Hu2018-07-122-0/+43
* | | | | | | | | | | | Merge branch 'fix/gb/add-missing-before-sha-predefined-variable' into 'master'Kamil Trzciński2018-07-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |