summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| * | | | | Fix GItHub client requests when rate limit is disabledDouglas Barbosa Alexandre2016-07-121-0/+9
| | |_|/ / | |/| | |
* | | | | Merge branch 'read-multi-rendered-objects' into 'master' Douwe Maan2016-07-121-7/+18
|\ \ \ \ \
| * | | | | Object renderer read_multi rendered entries from Cacheread-multi-rendered-objectsPaco Guzman2016-07-121-7/+18
* | | | | | Merge branch 'use-string-in-describe' into 'master' Douwe Maan2016-07-121-12/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into use-string-in-describeuse-string-in-describeLin Jen-Shin2016-07-125-5/+58
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Prefer string for describe as of:Lin Jen-Shin2016-07-121-12/+12
* | | | | | Reset project pushes_since_gc when we enqueue the git gc callPaco Guzman2016-07-121-9/+33
| |/ / / / |/| | | |
* | | | | Merge branch 'expire-branch-cache-after-gc' into 'master' Jacob Vosmaer (GitLab)2016-07-122-2/+26
|\ \ \ \ \
| * | | | | Expire the branch cache after `git gc` runsStan Hu2016-07-122-2/+26
| | |/ / / | |/| | |
* | | | | Be explicit on merge request discussion variablesPaco Guzman2016-07-121-0/+25
|/ / / /
* | | | Merge branch 'fix-expandable-diffs' into 'master' Rémy Coutable2016-07-121-3/+3
|\ \ \ \
| * | | | Fix expandable diffsSean McGivern2016-07-121-3/+3
| |/ / /
* | | | Merge branch 'remove-branch-api' into 'master' Rémy Coutable2016-07-121-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | api: expose {should,force}_remove_source_branchBen Boeckel2016-07-111-0/+4
* | | | Merge branch 'quick-start-ci-route' into 'master' Douwe Maan2016-07-123-22/+15
|\ \ \ \
| * | | | Fix failing tests.Connor Shea2016-07-112-21/+14
| * | | | Update the help_page_path route to accept paths directly instead of using par...Connor Shea2016-07-111-1/+1
* | | | | Merge branch 'optimize-cross-ref-system-notes-check' into 'master' Douwe Maan2016-07-124-4/+64
|\ \ \ \ \
| * | | | | Optimize system note visibility checking by hiding notes thatStan Hu2016-07-114-4/+64
| |/ / / /
* | | | | Merge branch 'master' into faster-diffsfaster-diffsJacob Schatz2016-07-1132-364/+1717
|\ \ \ \ \
| * \ \ \ \ Merge branch 'remove-pinto-from-flash' into 'master' Jacob Schatz2016-07-111-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove `pinTo` from `Flash` and make inline flash messages look nicer (!4854)winniehell2016-06-301-1/+1
| * | | | | Merge branch 'fix/import-event-error' into 'master' Robert Speicher2016-07-112-2/+29
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-even...James Lopez2016-07-11176-509/+5699
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
View Lorry Controller Status