summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Fix markdown rendering for consecutive label referencesDouglas Barbosa Alexandre2016-07-131-0/+40
| | |/ | |/|
* | | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-137-224/+144
* | | Merge branch 'better-parallel-diff' into 'master' Robert Speicher2016-07-131-27/+7
|\ \ \
| * | | Actually render old and new sections of parallel diff next to each otherbetter-parallel-diffDouwe Maan2016-07-131-27/+7
* | | | Merge branch 'dropdown-load-fix' into 'master' Douwe Maan2016-07-132-1/+13
|\ \ \ \
| * | | | formats my test properlytiagonbotelho2016-07-131-1/+2
| * | | | fixes test for simplified version of projecttiagonbotelho2016-07-121-1/+1
| * | | | fixes test according to four-phase test patterntiagonbotelho2016-07-121-0/+1
| * | | | adds test to check json fields on simple request and changes the url request ...tiagonbotelho2016-07-121-1/+0
| * | | | changes the project_title_spec accordinglytiagonbotelho2016-07-121-0/+1
| * | | | moves let variable to it statement by using a local variabletiagonbotelho2016-07-121-2/+2
| * | | | adds test to check json fields on simple request and changes the url request ...tiagonbotelho2016-07-122-1/+11
| * | | | changes the project_title_spec accordinglytiagonbotelho2016-07-121-1/+1
* | | | | Stub omniauth provider for GitLabgl-importer-keeps-issue-numberDouglas Barbosa Alexandre2016-07-131-1/+6
* | | | | Add spec for GitLab.com importerDouglas Barbosa Alexandre2016-07-131-0/+48
| |_|/ / |/| | |
* | | | Merge branch '18193-developers-can-merge' into 'master' Rémy Coutable2016-07-137-144/+224
|\ \ \ \
| * | | | Implement last round of review comments from !4892.18193-developers-can-mergeTimothy Andrew2016-07-132-22/+21
| * | | | Appease rubocop.Timothy Andrew2016-07-131-1/+0
| * | | | Refactor `Gitlab::GitAccess`Timothy Andrew2016-07-133-84/+92
| * | | | Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-134-78/+122
| * | | | Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-132-2/+32
* | | | | Merge branch '19766-dont-crash-when-no-objects-to-cache' into 'master' Rémy Coutable2016-07-131-0/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ObjectRenderer doesn't crash when no objects to cache with Rails.cache.read_m...Paco Guzman2016-07-131-0/+11
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-07-1341-108/+116
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'multi-line-inline-diff' into 'master' Douwe Maan2016-07-131-10/+18
| |\ \ \ \
| | * | | | Render inline diffs for multiple changed lines following eachotherDouwe Maan2016-07-111-10/+18
| | | |/ / | | |/| |
| * | | | Merge branch 'rs-describe-symbols' into 'master' Robert Speicher2016-07-1240-98/+98
| |\ \ \ \
| | * | | | Avoid `describe`-ing symbols in specsrs-describe-symbolsRobert Speicher2016-07-1241-110/+110
* | | | | | Merge branch 'add-2fa-check-to-oauth' into 'master' Robert Speicher2016-07-123-5/+73
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Refactor `mock_auth_hash`Patricio Cano2016-07-111-1/+1
| * | | | | Added a lot of stubbing to make sure OAUth requests are handled properly with...Patricio Cano2016-07-074-3/+30
| * | | | | Move Omniauth specific setup to its own filePatricio Cano2016-07-072-3/+2
| * | | | | Change order of stubbing to fix testsPatricio Cano2016-07-042-2/+1
| * | | | | Added tests for 2FA check on OAuth requestPatricio Cano2016-07-043-5/+48
* | | | | | Merge branch 'approval-required-todo' into 'master' Robert Speicher2016-07-121-0/+4
|\ \ \ \ \ \
| * | | | | | Add approval required todosapproval-required-todoSean McGivern2016-07-121-0/+4
* | | | | | | Merge branch 'lock_for_issuable' into 'master' Douwe Maan2016-07-122-0/+22
|\ \ \ \ \ \ \
| * | | | | | | Optimistic locking for Issue and Merge RequestsValery Sizov2016-07-122-0/+22
| |/ / / / / /
* | | | | | | Merge branch 'cache-todos-finder-calls' into 'master' Robert Speicher2016-07-121-30/+48
|\ \ \ \ \ \ \
| * | | | | | | Cache todos pending/done dashboard query countsPaco Guzman2016-07-121-30/+48
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'remove-unused-helper' into 'master' Robert Speicher2016-07-122-9/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | We're not using them (and look at the typo)remove-unused-helperLin Jen-Shin2016-07-122-9/+0
| |/ / / / /
* | | | | | Merge branch 'fix-gh-rate-limit' into 'master' Douwe Maan2016-07-121-0/+7
|\ \ \ \ \ \
| * | | | | | Remove unnecessary context from GitHub client specDouglas Barbosa Alexandre2016-07-121-6/+4
View Lorry Controller Status