summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-152-4/+4
|\
| * 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
| * 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 '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/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 '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
| |/
* | fix updated_at not preserved after import - for GitLab projectsJames Lopez2016-07-141-0/+8
|/
* 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-133-204/+134
* | 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-133-134/+204
|\
| * Implement last round of review comments from !4892.18193-developers-can-mergeTimothy Andrew2016-07-131-21/+19
| * Appease rubocop.Timothy Andrew2016-07-131-1/+0
| * Refactor `Gitlab::GitAccess`Timothy Andrew2016-07-132-82/+90
| * Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-132-72/+116
| * Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-131-0/+21
* | ObjectRenderer doesn't crash when no objects to cache with Rails.cache.read_m...Paco Guzman2016-07-131-0/+11
|/
* 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-126-8/+8
|\ \
| * | Avoid `describe`-ing symbols in specsrs-describe-symbolsRobert Speicher2016-07-126-8/+8
* | | 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
| |/ /
* | | Object renderer read_multi rendered entries from Cacheread-multi-rendered-objectsPaco Guzman2016-07-121-7/+18
|/ /
* | Optimize system note visibility checking by hiding notes thatStan Hu2016-07-112-4/+28
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-even...James Lopez2016-07-1155-192/+3353
|\ \
| * \ Merge branch 'fix/remove-import-url-migration' into 'master' Rémy Coutable2016-07-111-0/+6
| |\ \
| | * | spec and fix for sanitize methodJames Lopez2016-07-111-0/+6
| * | | Merge branch 'blockquote-fence-filter' into 'master' Robert Speicher2016-07-101-0/+14
| |\ \ \
| | * | | Fix typo in specDouwe Maan2016-07-101-1/+1
| | * | | Add blockquote fence syntax to MarkdownDouwe Maan2016-07-091-0/+14
| | | |/ | | |/|
| * | | Re-use queries in reference parsersreuse-queries-in-reference-parsersYorick Peterse2016-07-081-0/+75
| |/ /
| * | Merge branch '1548-average-commits-per-day' into 'master' Rémy Coutable2016-07-081-0/+39
| |\ \ | | |/ | |/|
| | * Infinity Bug in Commit StatisticsJonas Weber2016-05-201-0/+39
| * | Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-071-0/+70
| |\ \
| | * | Improve the error message displayed when branch creation fails.Timothy Andrew2016-07-051-0/+70
| * | | Add tests for PositionDouwe Maan2016-07-061-0/+341
| * | | Add tests for PositionTracerDouwe Maan2016-07-061-0/+1758
| * | | Add DiffNote modelDouwe Maan2016-07-062-6/+6
View Lorry Controller Status