summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'poll-test-fix' into 'master' Filipa Lacerda2017-04-121-36/+57
|\
| * Fixed random failures with Poll specpoll-test-fixPhil Hughes2017-04-121-36/+57
* | Merge branch 'fix_spaces_in_label_title' into 'master' Sean McGivern2017-04-121-0/+16
|\ \
| * | Remove heading and trailing spaces from label's color and titleblackst0ne2017-04-121-0/+16
* | | Merge branch '29056-backport-ee-cleanup-database-file' into 'master' Douwe Maan2017-04-122-4/+48
|\ \ \
| * | | removes redundant code from database.rb29056-backport-ee-cleanup-database-fileTiago Botelho2017-04-112-4/+48
* | | | Merge branch 'improve-discussions-feature-attempt-1' into 'master'Douwe Maan2017-04-125-94/+78
|\ \ \ \
| * | | | Separate examples for each otherimprove-discussions-feature-attempt-1Luke "Jared" Bennett2017-04-125-64/+66
| * | | | Collapse similar sibling scenariosLuke "Jared" Bennett2017-04-121-41/+12
| * | | | Use empty_project for resources that are independent of the repoLuke "Jared" Bennett2017-04-121-7/+18
* | | | | Merge branch 'zj-fix-coverage-bug' into 'master' Kamil Trzciński2017-04-122-7/+19
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Return nil as coverage instead of a File objectzj-fix-coverage-bugZ.J. van de Weg2017-04-122-7/+19
| | |/ / | |/| |
* | | | Merge branch 'zj-api-fix-build-events' into 'master' Rémy Coutable2017-04-121-4/+9
|\ \ \ \
| * | | | Fix API not accepting job_events for webhookszj-api-fix-build-eventsZ.J. van de Weg2017-04-121-4/+9
| | |/ / | |/| |
* | | | Merge branch 'siemens/gitlab-ce-fix/subgroup-hide-button' into 'master' Rémy Coutable2017-04-121-1/+2
|\ \ \ \
| * | | | Move permission to create subgroup into GroupPolicyDmitriy Zaporozhets2017-04-112-23/+2
| * | | | fix(subgroups): add verification of group creation capability to subgroup UIFabio Huser2017-03-301-0/+22
* | | | | Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-127-93/+138
|\ \ \ \ \
| * | | | | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-117-93/+138
| | |_|_|/ | |/| | |
* | | | | Merge branch '30457-expire-note-destroy' into 'master'Sean McGivern2017-04-121-1/+11
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix issue's note cache expiration after deletemhasbini2017-04-111-1/+11
* | | | | Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-114-3/+87
|\ \ \ \ \
| * | | | | Add specsDouwe Maan2017-04-104-2/+86
| * | | | | Some code tweaksDouwe Maan2017-04-081-1/+1
| * | | | | Fix specs and make tweaksDouwe Maan2017-04-081-2/+2
* | | | | | Merge branch '28017-separate-ce-params-on-api' into 'master' Douwe Maan2017-04-111-0/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Separate CE params on Grape APIOswaldo Ferreira2017-04-101-0/+7
* | | | | | Merge branch 'rs-remove-open-for-scope' into 'master' test-branch-nameDouwe Maan2017-04-111-9/+0
|\ \ \ \ \ \
| * | | | | | Remove an unused `Issue.open_for` scopeRobert Speicher2017-04-101-9/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'dz-fix-project-view' into 'master' Annabel Dunstone Gray2017-04-112-2/+19
|\ \ \ \ \ \
| * | | | | | Change project view default for existing users and anonymous visitors to file...dz-fix-project-viewDmitriy Zaporozhets2017-04-102-2/+19
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'signed-out-menu-shortcuts' into 'master' Jacob Schatz2017-04-111-13/+35
|\ \ \ \ \ \
| * | | | | | Added keyboard shortcuts to signed out menusigned-out-menu-shortcutsPhil Hughes2017-04-101-13/+35
* | | | | | | Merge branch 'mr-widget-bug-fix' into 'master' Stan Hu2017-04-111-0/+13
|\ \ \ \ \ \ \
| * | | | | | | Added tests and fixed a typoJose Ivan Vargas2017-04-101-0/+13
* | | | | | | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil Trzciński2017-04-113-20/+78
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add container registry repositories view specsfix/gb/improve-container-registry-clipboard-linksGrzegorz Bizon2017-04-101-0/+36
| * | | | | | | Add method that returns location of registry imageGrzegorz Bizon2017-04-101-0/+7
| * | | | | | | Improve test examples for container repository classGrzegorz Bizon2017-04-101-21/+21
| * | | | | | | Add method that returns a registry repository locationGrzegorz Bizon2017-04-101-0/+15
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fix_cache_expiration_in_repository' into 'master' Robert Speicher2017-04-101-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Fix redundant cache expiration in Repositoryblackst0ne2017-04-101-2/+0
| |/ / / / / /
* | | | | | | Don't show 'Copy content' button on text files that are not rendered as textDouwe Maan2017-04-101-5/+5
* | | | | | | Merge branch '1595-ee-backport-environments-tests' into 'master' Clement Ho2017-04-102-4/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Backport of EE changes in environments tests1595-ee-backport-environments-testsFilipa Lacerda2017-04-072-4/+6
* | | | | | | Merge branch 'backport-ee-1525' into 'master' Robert Speicher2017-04-104-50/+195
|\ \ \ \ \ \ \
| * | | | | | | Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs methodRémy Coutable2017-04-101-48/+44
| * | | | | | | Retrieve Git-specific env in Gitlab::Git::Repository#ruggedRémy Coutable2017-04-101-0/+30
| * | | | | | | Set Git-specific env in /api/internal/allowedRémy Coutable2017-04-101-2/+19
| * | | | | | | Add a Gitlab::Git::Env to store Git-specific env thread-safelyRémy Coutable2017-04-101-0/+102
| | |_|_|/ / / | |/| | | | |